Browse code

Merge "Includes a validation to disable creating initial networks for Neutron"

Jenkins authored on 2014/11/13 03:00:59
Showing 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"}
... ...
@@ -1274,7 +1274,7 @@ if is_service_enabled neutron; then
1274 1274
     start_neutron_agents
1275 1275
 fi
1276 1276
 # Once neutron agents are started setup initial network elements
1277
-if is_service_enabled q-svc; then
1277
+if is_service_enabled q-svc && [[ "$NEUTRON_CREATE_INITIAL_NETWORKS" == "True" ]]; then
1278 1278
     echo_summary "Creating initial neutron network elements"
1279 1279
     create_neutron_initial_network
1280 1280
     setup_neutron_debug