openstack/devstack
Code Issues Proposed changes

Merge "Remove setting use_floating_ips values"

Browse Source
This commit is contained in:
Jenkins 2015-03-10 11:51:14 +00:00 committed by Gerrit Code Review
commit b8c74c1108
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sahara
View File

@ -139,14 +139,12 @@ function configure_sahara {
if is_service_enabled neutron; then if is_service_enabled neutron; then
iniset $SAHARA_CONF_FILE DEFAULT use_neutron true 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 if is_ssl_enabled_service "neutron" || is_service_enabled tls-proxy; then
iniset $SAHARA_CONF_FILE neutron ca_file $SSL_BUNDLE_FILE iniset $SAHARA_CONF_FILE neutron ca_file $SSL_BUNDLE_FILE
fi fi
else else
iniset $SAHARA_CONF_FILE DEFAULT use_neutron false iniset $SAHARA_CONF_FILE DEFAULT use_neutron false
iniset $SAHARA_CONF_FILE DEFAULT use_floating_ips false
fi fi
if is_service_enabled heat; then if is_service_enabled heat; then