@@ -47,9 +47,9 @@ 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

-        if [[ -n "$OVS_BRIDGE_MAPPINGS" ]] && [[ "$ENABLE_TENANT_VLANS" == "True" ]]; then

+        if [[ -n "$ODL_PROVIDER_MAPPINGS" ]] && [[ "$ENABLE_TENANT_VLANS" == "True" ]]; then

             sudo ovs-vsctl set Open_vSwitch $ovstbl \

-                other_config:bridge_mappings=$OVS_BRIDGE_MAPPINGS

+                other_config:provider_mappings=$ODL_PROVIDER_MAPPINGS

         fi

         sudo ovs-vsctl set Open_vSwitch $ovstbl other_config:local_ip=$ODL_LOCAL_IP

     elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then

@@ -61,6 +61,9 @@ ODL_ARGS=${ODL_ARGS:-"-XX:MaxPermSize=384m"}

 # How long to pause after ODL starts to let it complete booting

 ODL_BOOT_WAIT=${ODL_BOOT_WAIT:-60}

+# The physical provider network to device mapping

+ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS:-physnet1:eth1}

+

 # Set up default directories