Browse code
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
Sam Hague authored on 2014/04/23 22:59:49Showing 1 changed files
| ... | ... |
@@ -47,7 +47,11 @@ if is_service_enabled odl-compute; then |
| 47 | 47 |
ODL_MGR_PORT=${ODL_MGR_PORT:-6640}
|
| 48 | 48 |
read ovstbl <<< $(sudo ovs-vsctl get Open_vSwitch . _uuid) |
| 49 | 49 |
sudo ovs-vsctl set-manager tcp:$ODL_MGR_IP:$ODL_MGR_PORT |
| 50 |
- sudo ovs-vsctl set Open_vSwitch $ovstbl other_config={"local_ip"="$ODL_LOCAL_IP"}
|
|
| 50 |
+ if [[ -n "$OVS_BRIDGE_MAPPINGS" ]] && [[ "$ENABLE_TENANT_VLANS" == "True" ]]; then |
|
| 51 |
+ sudo ovs-vsctl set Open_vSwitch $ovstbl \ |
|
| 52 |
+ other_config:bridge_mappings=$OVS_BRIDGE_MAPPINGS |
|
| 53 |
+ fi |
|
| 54 |
+ sudo ovs-vsctl set Open_vSwitch $ovstbl other_config:local_ip=$ODL_LOCAL_IP |
|
| 51 | 55 |
elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then |
| 52 | 56 |
# no-op |
| 53 | 57 |
: |