Browse code

Merge "Removed confusing duplication of ca config for keystone"

Jenkins authored on 2015/02/10 01:36:17
Showing 1 changed files
... ...
@@ -134,10 +134,6 @@ function configure_heat {
134 134
     iniset $HEAT_CONF keystone_authtoken cafile $SSL_BUNDLE_FILE
135 135
     iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR
136 136
 
137
-    if is_ssl_enabled_service "key"; then
138
-        iniset $HEAT_CONF clients_keystone ca_file $SSL_BUNDLE_FILE
139
-    fi
140
-
141 137
     # ec2authtoken
142 138
     iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_URI/v2.0
143 139