Merge "Fix barbican integration on compute nodes"

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-noha / openstack_gateway_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
index 6bd61a2..5b10442 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
@@ -24,6 +24,7 @@ parameters:
           address: ${_param:pxe_admin_address}
           netmask: ${_param:opnfv_net_admin_mask}
           mtu: ${_param:interface_mtu}
+          noifupdown: true
         primary_interface:
           enabled: true
           name: ${_param:primary_interface}
@@ -39,15 +40,22 @@ parameters:
         external_interface:
           enabled: true
           name: ${_param:external_interface}
-          mtu: ${_param:interface_mtu}
           proto: manual
-          type: eth
-          gateway: ${_param:opnfv_net_public_gw}
-          name_servers: {{ nm.dns_public }}
+          ovs_port_type: OVSPort
+          type: ovs_port
+          ovs_bridge: br-floating
+          bridge: br-floating
         br-floating:
           enabled: true
           type: ovs_bridge
           mtu: ${_param:interface_mtu}
+          proto: static
+          address: ${_param:external_address}
+          netmask: ${_param:opnfv_net_public_mask}
+          use_interfaces:
+            - ${_param:external_interface}
+          gateway: ${_param:opnfv_net_public_gw}
+          name_servers: {{ nm.dns_public }}
         br-mgmt:
           enabled: true
           type: bridge
@@ -57,18 +65,3 @@ parameters:
           mtu: ${_param:interface_mtu}
           use_interfaces:
             - ${_param:primary_interface}
-        float-to-ex:
-          enabled: true
-          type: ovs_port
-          mtu: ${_param:interface_mtu}
-          bridge: br-floating
-        br-ex:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
-          address: ${_param:external_address}
-          netmask: ${_param:opnfv_net_public_mask}
-          use_interfaces:
-            - ${_param:external_interface}
-          use_ovs_ports:
-            - float-to-ex