Merge "Enable neutron to work in a multi node setup"
diff --git a/lib/neutron b/lib/neutron
index c1552e3..7442efd 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -305,6 +305,9 @@
iniset $NOVA_CONF DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver
+ # optionally set options in nova_conf
+ neutron_plugin_create_nova_conf
+
if is_service_enabled neutron-metadata-agent; then
iniset $NOVA_CONF neutron service_metadata_proxy "True"
fi
diff --git a/lib/neutron_plugins/services/l3 b/lib/neutron_plugins/services/l3
index b598241..2e96284 100644
--- a/lib/neutron_plugins/services/l3
+++ b/lib/neutron_plugins/services/l3
@@ -146,6 +146,14 @@
}
function create_neutron_initial_network {
+ if ! is_service_enabled q-svc && ! is_service_enabled neutron-api; then
+ echo "Controller services not enabled. No networks configured!"
+ return
+ fi
+ if [[ "$NEUTRON_CREATE_INITIAL_NETWORKS" == "False" ]]; then
+ echo "Network creation disabled!"
+ return
+ fi
local project_id
project_id=$(openstack project list | grep " demo " | get_field 1)
die_if_not_set $LINENO project_id "Failure retrieving project_id for demo"
diff --git a/stack.sh b/stack.sh
index 4b07184..f47842b 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1267,10 +1267,7 @@
start_neutron
fi
# Once neutron agents are started setup initial network elements
-if is_service_enabled q-svc && [[ "$NEUTRON_CREATE_INITIAL_NETWORKS" == "True" ]]; then
- echo_summary "Creating initial neutron network elements"
- create_neutron_initial_network
-fi
+create_neutron_initial_network
if is_service_enabled nova; then
echo_summary "Starting Nova"