summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-12 12:48:28 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-12 12:48:28 +0400
commit0f9a80d1ae908c6dd5fb780ad91ba3bea2a9fb38 (patch)
tree1c1bc659ffad36967cd77ab6399a45753e95cb85
parente9cce3a7cb13b00c631518a53e85ea90dd654ac4 (diff)
[baremetal] Set public vlan tag on ovs port
Change-Id: Ia5a34d8d8a9649fc911198fed86aee51071ba568 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j26
1 files changed, 4 insertions, 2 deletions
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