1. devstack
  2. Commit 0f97841dfa0187a34f3345ba5f6e58d398e82832
Browse code

Remove duplicate entry for flat_networks

Currently if PHYSICAL_NETWORK and PUBLIC_PHYSICAL_NETWORK are
same then duplicate entry is created in ml2_conf.ini like below:
flat_networks = public,public,

With this patch, if PHYSICAL_NETWORK and PUBLIC_PHYSICAL_NETWORK
are same then add only PHYSICAL_NETWORK to flat_networks in
ml2_conf.ini

Change-Id: Iae4d1ee3882f6d96b4e4abd52ecc673a620563b5
Closes-Bug: #1654148

yatin authored on 2017/01/05 16:02:57
Showing 1 changed files
lib/neutron_plugins/ml2
History View file @ 0f97841
... ... 
@@ -105,7 +105,7 @@ function neutron_plugin_configure_service {
105 105 
             if [[ -n "$PHYSICAL_NETWORK" ]]; then
106 106 
                 Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PHYSICAL_NETWORK},"
107 107 
             fi
108 
-            if [[ -n "$PUBLIC_PHYSICAL_NETWORK" ]]; then
108 
+            if [[ -n "$PUBLIC_PHYSICAL_NETWORK" ]] && [[ "${PHYSICAL_NETWORK}" != "$PUBLIC_PHYSICAL_NETWORK" ]]; then
109 109 
                 Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PUBLIC_PHYSICAL_NETWORK},"
110 110 
             fi
111 111 
         fi