Browse code
Includes a validation to disable creating initial networks for Neutron
Neutron external and internal networks are created by default
This commit let developers by configuration to decide if those
networks needs to be created. This is needed to test Neutron DVR
in a distributed Multi-node environment
Change-Id: I17d891d072f189925676b4557094cde1c7a71579
Closes-Bug: 1389288
Edgar Magana authored on 2014/11/05 01:32:54Showing 2 changed files
| ... | ... |
@@ -131,6 +131,8 @@ Q_NOTIFY_NOVA_PORT_STATUS_CHANGES=${Q_NOTIFY_NOVA_PORT_STATUS_CHANGES:-True}
|
| 131 | 131 |
Q_NOTIFY_NOVA_PORT_DATA_CHANGES=${Q_NOTIFY_NOVA_PORT_DATA_CHANGES:-True}
|
| 132 | 132 |
VIF_PLUGGING_IS_FATAL=${VIF_PLUGGING_IS_FATAL:-True}
|
| 133 | 133 |
VIF_PLUGGING_TIMEOUT=${VIF_PLUGGING_TIMEOUT:-300}
|
| 134 |
+# Specify if the initial private and external networks should be created |
|
| 135 |
+NEUTRON_CREATE_INITIAL_NETWORKS=${NEUTRON_CREATE_INITIAL_NETWORKS:-True}
|
|
| 134 | 136 |
|
| 135 | 137 |
## Provider Network Information |
| 136 | 138 |
PROVIDER_SUBNET_NAME=${PROVIDER_SUBNET_NAME:-"provider_net"}
|
| ... | ... |
@@ -1275,7 +1275,7 @@ if is_service_enabled neutron; then |
| 1275 | 1275 |
start_neutron_agents |
| 1276 | 1276 |
fi |
| 1277 | 1277 |
# Once neutron agents are started setup initial network elements |
| 1278 |
-if is_service_enabled q-svc; then |
|
| 1278 |
+if is_service_enabled q-svc && [[ "$NEUTRON_CREATE_INITIAL_NETWORKS" == "True" ]]; then |
|
| 1279 | 1279 |
echo_summary "Creating initial neutron network elements" |
| 1280 | 1280 |
create_neutron_initial_network |
| 1281 | 1281 |
setup_neutron_debug |