Browse code

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

Jenkins authored on 2014/06/18 04:47:12
Showing 1 changed files
... ...
@@ -115,6 +115,10 @@ function configure_heat {
115 115
     iniset $HEAT_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
116 116
     iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR
117 117
 
118
+    if is_ssl_enabled_service "key"; then
119
+        iniset $HEAT_CONF clients_keystone ca_file $KEYSTONE_SSL_CA
120
+    fi
121
+
118 122
     # ec2authtoken
119 123
     iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_URI/v2.0
120 124