diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-02 16:37:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-02 16:37:51 +0000 |
| commit | 7d810c4b63ec05bb39b1fd6be570623075b6a99d (patch) | |
| tree | 8957ba9b20b3cb43813614cb3cbdd113bffd5bff /mcp/reclass/classes/cluster/mcp-pike-common-ha | |
| parent | 7244993e2da33720870fb4274eaa960519a71587 (diff) | |
| parent | 9214e85db2f15984f7d49d855834f218feaf1164 (diff) | |
Merge "Conform network scheme to tagged public interface"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 | 12 |
1 files changed, 3 insertions, 9 deletions
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 |