From 408efd2170a5310f9ae2b3abb3fd8e2129698b8d Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Wed, 23 Apr 2014 09:59:49 -0400 Subject: [PATCH] Add bridge_mappings to extras/80-opendaylight.sh to support vlan isolation. OpenDaylight integration with Openstack requires some extra configuration information to be set in the ovsdb via the other_config value. Currently only the local ip address is set. bridge_mappings needs to be added to support vlan isolation. This requires changing the form of the existing ovs-vsctl command to set the other_config value. The current command does a replace so the last command to run overwrites any other values. The command is changed to append values instead. Change-Id: Ia001ecf27c8f5ace05af014ecce0b13f6d490ac1 --- extras.d/80-opendaylight.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extras.d/80-opendaylight.sh b/extras.d/80-opendaylight.sh index c3c85fc963..bf99866f92 100644 --- a/extras.d/80-opendaylight.sh +++ b/extras.d/80-opendaylight.sh @@ -47,7 +47,11 @@ if is_service_enabled odl-compute; then ODL_MGR_PORT=${ODL_MGR_PORT:-6640} read ovstbl <<< $(sudo ovs-vsctl get Open_vSwitch . _uuid) sudo ovs-vsctl set-manager tcp:$ODL_MGR_IP:$ODL_MGR_PORT - sudo ovs-vsctl set Open_vSwitch $ovstbl other_config={"local_ip"="$ODL_LOCAL_IP"} + if [[ -n "$OVS_BRIDGE_MAPPINGS" ]] && [[ "$ENABLE_TENANT_VLANS" == "True" ]]; then + sudo ovs-vsctl set Open_vSwitch $ovstbl \ + other_config:bridge_mappings=$OVS_BRIDGE_MAPPINGS + fi + sudo ovs-vsctl set Open_vSwitch $ovstbl other_config:local_ip=$ODL_LOCAL_IP elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then # no-op :