commit 858a105c81f1571825d086d359ca7538079072fb
author Jenkins <jenkins@review.openstack.org> Sun Jan 08 17:38:26 2017 +0000
committer Gerrit Code Review <review@openstack.org> Sun Jan 08 17:38:26 2017 +0000
tree de0c9945488fa816aa2944a4f68c7169ed12a482
parent 847c449b9216ed05a2091c8676ca5e0979227755
parent 0f97841dfa0187a34f3345ba5f6e58d398e82832

Merge "Remove duplicate entry for flat_networks"

lib/neutron_plugins/ml2

diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2
index eed0fc2..c5a4c02 100644
--- a/lib/neutron_plugins/ml2
+++ b/lib/neutron_plugins/ml2
@@ -105,7 +105,7 @@
             if [[ -n "$PHYSICAL_NETWORK" ]]; then
                 Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PHYSICAL_NETWORK},"
             fi
-            if [[ -n "$PUBLIC_PHYSICAL_NETWORK" ]]; then
+            if [[ -n "$PUBLIC_PHYSICAL_NETWORK" ]] && [[ "${PHYSICAL_NETWORK}" != "$PUBLIC_PHYSICAL_NETWORK" ]]; then
                 Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PUBLIC_PHYSICAL_NETWORK},"
             fi
         fi