Merge "Configure heat keystone client for SSL when keystone uses SSL"
This commit is contained in:
commit
ef837e4c7f
4
lib/heat
4
lib/heat
@ -115,6 +115,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_URI/v2.0
|
iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_URI/v2.0
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user