From e1d013f9265a86c00ec02822f2425874fa97769f Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 10 Feb 2015 14:15:35 -0500 Subject: [PATCH] Set ca_certificates_file in tempest, fix test for "keystone" Configure tempest with the location of the devstack CA bundle. Fix a conditional that was looking for the "keystone" service when it should be "key". This affected users who set USE_SSL=True Change-Id: I7171d7bd539443dce9f3b1a80274b7861abdcfdb --- lib/tempest | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/tempest b/lib/tempest index 777d03e0f3..3d9d8bb47e 100644 --- a/lib/tempest +++ b/lib/tempest @@ -292,6 +292,9 @@ function configure_tempest { iniset $TEMPEST_CONFIG identity admin_tenant_id $ADMIN_TENANT_ID iniset $TEMPEST_CONFIG identity admin_domain_name $ADMIN_DOMAIN_NAME iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2} + if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then + iniset $TEMPEST_CONFIG identity ca_certificates_file $SSL_BUNDLE_FILE + fi # Image # for the gate we want to be able to override this variable so we aren't @@ -482,7 +485,7 @@ function configure_tempest { fi done - if is_ssl_enabled_service "keystone" || is_service_enabled tls-proxy; then + if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then # Use the BOTO_CONFIG environment variable to point to this file iniset $BOTO_CONF Boto ca_certificates_file $SSL_BUNDLE_FILE sudo chown $STACK_USER $BOTO_CONF