From 3b338ea9f19052eb4cf3dc70d9d49d03cb602ef2 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 28 Mar 2018 13:50:33 +0400
Subject: [odl] Setup manager target after ovs host config

Change-Id: Ia517b7cf1723a5afaf43cb0709716f3a67a29e9f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 .../cluster/mcp-pike-odl-noha/openstack/compute.yml  | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'mcp/reclass/classes/cluster')

diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
index e7e06a61d..b0690167f 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
@@ -14,17 +14,13 @@ classes:
 parameters:
   linux:
     network:
-      gateway: ${_param:openstack_gateway_address}
       interface:
         external_interface:
           enabled: true
+          type: eth
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
-          ovs_port_type: OVSPort
-          type: ovs_port
-          ovs_bridge: br-floating
-          bridge: br-floating
         br-mesh:
           enabled: true
           type: bridge
@@ -37,6 +33,18 @@ parameters:
           enabled: true
           type: ovs_bridge
           mtu: ${_param:interface_mtu}
-          proto: static
+        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
-- 
cgit 1.2.3-korg