openstack/devstack
Code Issues Proposed changes

Merge "Configure heat keystone client for SSL when keystone uses SSL"

Browse Source
This commit is contained in:
Jenkins 2014-06-17 19:47:12 +00:00 committed by Gerrit Code Review
commit ef837e4c7f
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

@ -115,6 +115,10 @@ function configure_heat {
iniset $HEAT_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
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
iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_URI/v2.0