Merge "Remove setting use_floating_ips values"

2015-03-10 11:51:14 +00:00
parent 4de0f1cd0b 360839e0ad
commit b8c74c1108
1 changed files with 0 additions and 2 deletions
--- a/lib/sahara
+++ b/lib/sahara
@@ -139,14 +139,12 @@ 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

        if is_ssl_enabled_service "neutron" || is_service_enabled tls-proxy; then
            iniset $SAHARA_CONF_FILE neutron ca_file $SSL_BUNDLE_FILE
        fi
    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