diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-12 16:31:38 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-12 16:31:38 +0400 |
| commit | de0bc2fc6e1c911630b0564a5ab384e27e1ea445 (patch) | |
| tree | a489b4908367f1390a5298cc01af5cf31366d8e4 | |
| parent | 4358626b73ccf83ced0c0178185dd9a868d0f4d7 (diff) | |
Revert "[baremetal] Migrate public bridge to ovs"
Vlan tagging on ovs+linux ports doesn't work as expected.
This reverts commit c3316c713c936b154b979aa985a400f4b791c0cb.
Change-Id: I339cd741c83781e4a946bfde40f7f2551bb9cf02
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 index cad407f57..687777b2c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 @@ -27,8 +27,6 @@ {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%} {%- set vlan_private = conf['net_config']['private']['vlan'] -%} {%- set vlan_public = conf['net_config']['public']['vlan'] -%} - - {%- set gateway_public = conf['net_config']['public']['gateway'] -%} {%- else -%} {%- set nic_admin = 'enp6s0' -%} {%- set nic_mgmt = 'enp6s0' -%} @@ -92,31 +90,18 @@ parameters: enabled: true type: ovs_bridge mtu: ${_param:interface_mtu} + float-to-ex: + enabled: true + type: ovs_port + mtu: ${_param:interface_mtu} + bridge: br-floating br-ex: enabled: true - type: ovs_bridge + type: bridge mtu: ${_param:interface_mtu} address: ${_param:external_address} netmask: 255.255.255.0 - proto: static - gateway: {{ gateway_public }} - floating-to-ex: - enabled: true - type: ovs_port - port_type: patch - bridge: br-floating - peer: ex-to-floating - ex-to-floating: - enabled: true - type: ovs_port - port_type: patch - bridge: br-ex - peer: floating-to-ex - public_ovs_interface: - enabled: true - name: {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %} - proto: manual - ovs_port_type: OVSPort - type: ovs_port - ovs_bridge: br-ex - bridge: br-ex + use_interfaces: + - {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %} + use_ovs_ports: + - float-to-ex |