From 4979a23b8b2c0094ced98cf05eebb692d6609937 Mon Sep 17 00:00:00 2001
From: Wojciech Dec <wdec@cisco.com>
Date: Wed, 17 Aug 2016 13:14:23 +0200
Subject: Correcting networking-odl to mitaka/stable + app topology patch

Change-Id: Iddcd8dda2d49fcdd8e0f37a1d052a6fa8a24b035
Signed-off-by: Wojciech Dec <wdec@cisco.com>
---
 networking-odl/devstack/entry_points | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'networking-odl/devstack/entry_points')

diff --git a/networking-odl/devstack/entry_points b/networking-odl/devstack/entry_points
index 647960f..939839a 100644
--- a/networking-odl/devstack/entry_points
+++ b/networking-odl/devstack/entry_points
@@ -54,9 +54,8 @@ function configure_opendaylight {
         fi
     fi
 
-    # Configure L3 if the user wants it for NETVIRT_OVSDB
-    # L3 is always enabled in NETVIRT_VPNSERVICE
-    if [[ ",$ODL_NETVIRT_KARAF_FEATURE," =~ ",$ODL_NETVIRT_KARAF_FEATURE_OVSDB," ]] && [ "${ODL_L3}" == "True" ]; then
+    # Configure L3 if the user wants it
+    if [ "${ODL_L3}" == "True" ]; then
         # Configure L3 FWD if it's not there
         local L3FWD=$(cat $ODL_DIR/$ODL_NAME/etc/custom.properties | \
                       grep ^ovsdb.l3.fwd.enabled)
@@ -129,10 +128,6 @@ function configure_neutron_odl {
     populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_odl username=$ODL_USERNAME
     populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_odl password=$ODL_PASSWORD
     populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_odl port_binding_controller=$ODL_PORT_BINDING_CONTROLLER
-    # When it's not set, the default value is set by networking-odl
-    if [[ -n "$ODL_HOSTCONF_URI" ]]; then
-        populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_odl odl_hostconf_uri=$ODL_HOSTCONF_URI
-    fi
 }
 
 function configure_neutron_odl_lightweight_testing {
@@ -254,6 +249,7 @@ function cleanup_opendaylight_compute {
     done
 }
 
+
 # bind_opendaylight_controller() - set control manager to OVS
 function bind_opendaylight_controller {
     echo_summary "Initializing OpenDaylight"
@@ -263,13 +259,9 @@ function bind_opendaylight_controller {
     read ovstbl <<< $(sudo ovs-vsctl get Open_vSwitch . _uuid)
     local ODL_MANAGERS_PARAM=()
     for manager in $(echo $ODL_OVS_MANAGERS | tr "," "\n"); do
-        # ovsdbd doesn't understand localhost. replace it to numerical ip address
-        ODL_MANAGERS_PARAM=( "${ODL_MANAGERS_PARAM[@]}" "tcp:${manager/localhost/127.0.0.1}:$ODL_MGR_PORT" )
+        ODL_MANAGERS_PARAM=( "${ODL_MANAGERS_PARAM[@]}" "tcp:$manager:$ODL_MGR_PORT" )
     done
-    # don't overwrite the already existing managers
-    local ODL_MANAGERS_OLD=$(sudo ovs-vsctl get-manager)
-    local ODL_MANAGERS=$(echo $ODL_MANAGERS_OLD ${ODL_MANAGERS_PARAM[@]} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')
-    sudo ovs-vsctl set-manager ${ODL_MANAGERS}
+    sudo ovs-vsctl set-manager ${ODL_MANAGERS_PARAM[@]}
     if [[ -n "$ODL_PROVIDER_MAPPINGS" ]]; then
         sudo ovs-vsctl set Open_vSwitch $ovstbl \
             other_config:provider_mappings=$ODL_PROVIDER_MAPPINGS
@@ -277,6 +269,7 @@ function bind_opendaylight_controller {
     sudo ovs-vsctl set Open_vSwitch $ovstbl other_config:local_ip=$ODL_LOCAL_IP
 }
 
+
 # unbind_opendaylight_controller() - disconnect controller from switch and clear bridges
 function unbind_opendaylight_controller {
     sudo ovs-vsctl del-manager
-- 
cgit 1.2.3-korg