Skip to content

Commit 858a105

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored andcommitted
Merge "Remove duplicate entry for flat_networks"
2 parents 847c449 + 0f97841 commit 858a105

File tree

1 file changed

+1
-1
lines changed
  • lib/neutron_plugins

1 file changed

+1
-1
lines changed

lib/neutron_plugins/ml2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ function neutron_plugin_configure_service {
105105
if [[ -n "$PHYSICAL_NETWORK" ]]; then
106106
Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PHYSICAL_NETWORK},"
107107
fi
108-
if [[ -n "$PUBLIC_PHYSICAL_NETWORK" ]]; then
108+
if [[ -n "$PUBLIC_PHYSICAL_NETWORK" ]] && [[ "${PHYSICAL_NETWORK}" != "$PUBLIC_PHYSICAL_NETWORK" ]]; then
109109
Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PUBLIC_PHYSICAL_NETWORK},"
110110
fi
111111
fi

0 commit comments

Comments
 (0)