From 9214e85db2f15984f7d49d855834f218feaf1164 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 22 Feb 2018 18:47:28 +0400 Subject: Conform network scheme to tagged public interface Change-Id: I503c8ad32900406e1fa375cec9a91b454889d8bf Signed-off-by: Michael Polenchuk --- .../cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha') diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 index d0457bafc..48b9a9286 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 @@ -71,23 +71,17 @@ parameters: enabled: true type: ovs_bridge mtu: ${_param:interface_mtu} - br-ex: - enabled: true - type: ovs_port - bridge: br-floating proto: static - {%- if nm.vlan_public and nm.vlan_public != 'native' %} - ovs_options: tag={{ nm.vlan_public }} - {%- endif %} address: ${_param:external_address} - netmask: 255.255.255.0 + netmask: ${_param:opnfv_net_public_mask} route: public: address: 0.0.0.0 netmask: 0.0.0.0 gateway: ${_param:opnfv_net_public_gw} - {{ nm.cmp001.nic_public }}: + ovs_port_{{ nm.cmp001.nic_public }}: enabled: true + name: {{ nm.cmp001.nic_public }}{% if nm.vlan_public and nm.vlan_public != 'native' %}.{{ nm.vlan_public }}{% endif %} proto: manual ovs_port_type: OVSPort type: ovs_port -- cgit 1.2.3-korg