commit ef837e4c7fdf551685385953dd1dc6e935f482fd
author Jenkins <jenkins@review.openstack.org> Tue Jun 17 19:47:12 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jun 17 19:47:12 2014 +0000
tree 98e02e7234f482a36e49bc63e236077046c72af9
parent a4de9a9c350dc89b1a108bbecba549da0e5d6579
parent fefd64b878a3e4ecfc2b1b385f47c1d7f7593648

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

lib/heat

diff --git a/lib/heat b/lib/heat
index e27943a..b8c0359 100644
--- a/lib/heat
+++ b/lib/heat
@@ -115,6 +115,10 @@
     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