Browse code
Merge "Fix issue with ml2 plugin on using provider network"
Jenkins authored on 2015/04/24 02:45:49Showing 1 changed files
| ... | ... |
@@ -89,7 +89,7 @@ function neutron_plugin_configure_service {
|
| 89 | 89 |
|
| 90 | 90 |
# Allow for setup the flat type network |
| 91 | 91 |
if [[ -z "$Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS" && -n "$PHYSICAL_NETWORK" ]]; then |
| 92 |
- Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS="flat_networks=$Q_ML2_FLAT_PHYSNET_OPTIONS" |
|
| 92 |
+ Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS="flat_networks=$PHYSICAL_NETWORK" |
|
| 93 | 93 |
fi |
| 94 | 94 |
# REVISIT(rkukura): Setting firewall_driver here for |
| 95 | 95 |
# neutron.agent.securitygroups_rpc.is_firewall_enabled() which is |