| commit | 0f6122fb3ef932fd76c61968e5d04dce184485e2 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Tue Jan 20 15:46:34 2015 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Tue Jan 20 15:46:34 2015 +0000 |
| tree | 378f23420540e324af20dec5d79db1ec11c974cd | |
| parent | 955f80a7efe6d5c78fb80d957f63803ef3c0486c [diff] | |
| parent | 0943e076624274978d1e87c8a44f80df9151a5e9 [diff] |
Merge "[Sahara] Set use_floating_ips=false for nova network"
diff --git a/lib/sahara b/lib/sahara index 8573ee8..871833f 100644 --- a/lib/sahara +++ b/lib/sahara
@@ -128,6 +128,9 @@ 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