Merge "Remove duplicate entry for flat_networks"

This commit is contained in:
Jenkins 2017-01-08 17:38:26 +00:00 committed by Gerrit Code Review
commit 858a105c81

View File

@ -105,7 +105,7 @@ function neutron_plugin_configure_service {
if [[ -n "$PHYSICAL_NETWORK" ]]; then if [[ -n "$PHYSICAL_NETWORK" ]]; then
Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PHYSICAL_NETWORK}," Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PHYSICAL_NETWORK},"
fi 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}," Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PUBLIC_PHYSICAL_NETWORK},"
fi fi
fi fi