Merge "[Sahara] Set use_floating_ips=false for nova network"

2015-01-20 15:46:34 +00:00 · 2015-01-20 15:46:34 +00:00 · 0f6122fb3e
commit 0f6122fb3e
parent 955f80a7ef 0943e07662
1 changed files with 3 additions and 0 deletions
--- a/lib/sahara
+++ b/lib/sahara
@ -128,6 +128,9 @@ function configure_sahara {
    if is_service_enabled neutron; then
        iniset $SAHARA_CONF_FILE DEFAULT use_neutron true
        iniset $SAHARA_CONF_FILE DEFAULT use_floating_ips true
+    else
+        iniset $SAHARA_CONF_FILE DEFAULT use_neutron false
+        iniset $SAHARA_CONF_FILE DEFAULT use_floating_ips false
    fi

    if is_service_enabled heat; then