openstack/devstack
Code Issues Proposed changes

Merge "Removed confusing duplication of ca config for keystone"

Browse Source
This commit is contained in:
Jenkins
2015-02-09 16:36:17 +00:00
committed by Gerrit Code Review
parent 24419a87de 76549e332e
commit 2c45a60b01
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/heat
View File

@@ -134,10 +134,6 @@ function configure_heat {
iniset $HEAT_CONF keystone_authtoken cafile $SSL_BUNDLE_FILE
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 $SSL_BUNDLE_FILE
fi
# ec2authtoken
iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_URI/v2.0