openstack/devstack
Code Issues Proposed changes

Configure heat keystone client for SSL when keystone uses SSL

Browse Source 
When SSL is enabled in Keystone, the path to the Keystone CA file
needs to be set in ca_file in the clients_keystone section.

Change-Id: Ic324e09b42a96d0ba31e13f8e8042cb3ac24d0b6
Closes-Bug: 1324207
This commit is contained in:
Rob Crittenden 2014-05-27 22:27:15 -04:00
parent 5069ae9eef
commit fefd64b878
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/heat
View File

@ -117,6 +117,10 @@ function configure_heat {
iniset $HEAT_CONF keystone_authtoken admin_password $SERVICE_PASSWORD iniset $HEAT_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR
if is_ssl_enabled_service "key"; then
iniset $HEAT_CONF clients_keystone ca_file $KEYSTONE_SSL_CA
fi
# ec2authtoken # ec2authtoken
iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0