commit 190ee7931719c96a32c1b11230bb521c7e35a0fb
author Petr Michalec <pmichalec@mirantis.com> Sat Mar 17 13:19:45 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Sat Mar 17 13:19:45 2018 +0000
tree 7fb1cc028a3acf23caced33d61d16b86fbddc6b2
parent e2a97012428666d3d5ed87ca28e4f6c576163380
parent 3b6951fc72b7c4eee8dc62fb6c0a8d50034346c8

Merge "[pike-ovs] Simplify external network scheme"

classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml

diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
index 37ca230..4cb8093 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
@@ -37,11 +37,13 @@
           type: eth
         external_interface:
           enabled: true
-          ipflush_onchange: true
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
-          type: eth
+          ovs_port_type: OVSPort
+          type: ovs_port
+          ovs_bridge: br-floating
+          bridge: br-floating
         br-floating:
           enabled: true
           type: ovs_bridge
@@ -69,13 +71,6 @@
           type: ovs_port
           mtu: ${_param:interface_mtu}
           bridge: br-floating
-        br-ex:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
+          proto: static
           address: ${_param:external_address}
           netmask: 255.255.255.0
-          use_interfaces:
-          - ${_param:external_interface}
-          use_ovs_ports:
-          - float-to-ex