openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-01-20 15:46:34 +00:00 committed by Gerrit Code Review
commit 0f6122fb3e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/sahara
View File

@ -128,6 +128,9 @@ 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 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 fi
if is_service_enabled heat; then if is_service_enabled heat; then