commit 5ea9fb13056f9aa738711acf445b78914b734570
author Jenkins <jenkins@review.openstack.org> Thu Apr 23 17:45:49 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Apr 23 17:45:49 2015 +0000
tree 67b82f9ac75e94545fb25b82651a17cd57299fde
parent cd7655cbfcc119e5dafe308ce31e54d3e28b3b63
parent 8f5fe871a45585fdbc72aacca6f8528b1f4d328d

Merge "Fix issue with ml2 plugin on using provider network"

lib/neutron_plugins/ml2

diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2
index e3b2c4d..abe6ea7 100644
--- a/lib/neutron_plugins/ml2
+++ b/lib/neutron_plugins/ml2
@@ -89,7 +89,7 @@
 
     # Allow for setup the flat type network
     if [[ -z "$Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS" && -n "$PHYSICAL_NETWORK" ]]; then
-            Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS="flat_networks=$Q_ML2_FLAT_PHYSNET_OPTIONS"
+            Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS="flat_networks=$PHYSICAL_NETWORK"
     fi
     # REVISIT(rkukura): Setting firewall_driver here for
     # neutron.agent.securitygroups_rpc.is_firewall_enabled() which is