diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha')
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml index 3b237eb22..4f93914cf 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml @@ -9,8 +9,8 @@ classes: - system.linux.system.single - cluster.all-mcp-arch-common - # - cluster.baremetal-mcp-ocata-common-ha.stacklight - # - cluster.baremetal-mcp-ocata-common-ha.stacklight.client + # - cluster.baremetal-mcp-pike-common-ha.stacklight + # - cluster.baremetal-mcp-pike-common-ha.stacklight.client parameters: _param: apt_mk_version: nightly diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 index cad407f57..3c51abf4a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 @@ -112,9 +112,11 @@ parameters: port_type: patch bridge: br-ex peer: floating-to-ex - public_ovs_interface: + {{ nic_public }}: enabled: true - name: {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %} + {%- if vlan_public and vlan_public != 'native' %} + ovs_options: tag={{ vlan_public }} + {%- endif %} proto: manual ovs_port_type: OVSPort type: ovs_port |