openstack/devstack
Code Issues Proposed changes

Merge "Configure sahara to work with other secured services"

Browse Source
This commit is contained in:
Jenkins
2015-02-10 14:27:26 +00:00
committed by Gerrit Code Review
parent fdb00b4b56 4f7e0f27e8
commit 5bdb2204bd
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/sahara
View File

@@ -124,6 +124,10 @@ 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
@@ -131,10 +135,30 @@ function configure_sahara {
if is_service_enabled heat; then
iniset $SAHARA_CONF_FILE DEFAULT infrastructure_engine heat
if is_ssl_enabled_service "heat" || is_service_enabled tls-proxy; then
iniset $SAHARA_CONF_FILE heat ca_file $SSL_BUNDLE_FILE
fi
else
iniset $SAHARA_CONF_FILE DEFAULT infrastructure_engine direct
fi
if is_ssl_enabled_service "cinder" || is_service_enabled tls-proxy; then
iniset $SAHARA_CONF_FILE cinder ca_file $SSL_BUNDLE_FILE
fi
if is_ssl_enabled_service "nova" || is_service_enabled tls-proxy; then
iniset $SAHARA_CONF_FILE nova ca_file $SSL_BUNDLE_FILE
fi
if is_ssl_enabled_service "swift" || is_service_enabled tls-proxy; then
iniset $SAHARA_CONF_FILE swift ca_file $SSL_BUNDLE_FILE
fi
if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then
iniset $SAHARA_CONF_FILE keystone ca_file $SSL_BUNDLE_FILE
fi
iniset $SAHARA_CONF_FILE DEFAULT use_syslog $SYSLOG
# Format logging