|
...
|
...
|
@@ -139,14 +139,12 @@ function configure_sahara {
|
|
139
|
139
|
|
|
140
|
140
|
if is_service_enabled neutron; then
|
|
141
|
141
|
iniset $SAHARA_CONF_FILE DEFAULT use_neutron true
|
|
142
|
|
- iniset $SAHARA_CONF_FILE DEFAULT use_floating_ips true
|
|
143
|
142
|
|
|
144
|
143
|
if is_ssl_enabled_service "neutron" || is_service_enabled tls-proxy; then
|
|
145
|
144
|
iniset $SAHARA_CONF_FILE neutron ca_file $SSL_BUNDLE_FILE
|
|
146
|
145
|
fi
|
|
147
|
146
|
else
|
|
148
|
147
|
iniset $SAHARA_CONF_FILE DEFAULT use_neutron false
|
|
149
|
|
- iniset $SAHARA_CONF_FILE DEFAULT use_floating_ips false
|
|
150
|
148
|
fi
|
|
151
|
149
|
|
|
152
|
150
|
if is_service_enabled heat; then
|