| commit | 2c45a60b01a7bb86e2d9d42f69f756632687548c | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Mon Feb 09 16:36:17 2015 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Mon Feb 09 16:36:17 2015 +0000 |
| tree | f6a944d56cc3d4c4b442d62ae476620380dbbbcc | |
| parent | 24419a87def1c146556cd0bb345352da287db3cb [diff] | |
| parent | 76549e332e51e6bd53d16656433c90e9da8ce8d5 [diff] |
Merge "Removed confusing duplication of ca config for keystone"
diff --git a/lib/heat b/lib/heat index 58439d6..48e2afc 100644 --- a/lib/heat +++ b/lib/heat
@@ -134,10 +134,6 @@ 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