Browse code

Merge "Set ca_certificates_file in tempest, fix test for "keystone""

Jenkins authored on 2015/02/11 22:49:56
Showing 1 changed files
... ...
@@ -292,6 +292,9 @@ function configure_tempest {
292 292
     iniset $TEMPEST_CONFIG identity admin_tenant_id $ADMIN_TENANT_ID
293 293
     iniset $TEMPEST_CONFIG identity admin_domain_name $ADMIN_DOMAIN_NAME
294 294
     iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2}
295
+    if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then
296
+        iniset $TEMPEST_CONFIG identity ca_certificates_file $SSL_BUNDLE_FILE
297
+    fi
295 298
 
296 299
     # Image
297 300
     # for the gate we want to be able to override this variable so we aren't
... ...
@@ -482,7 +485,7 @@ function configure_tempest {
482 482
         fi
483 483
     done
484 484
 
485
-    if is_ssl_enabled_service "keystone" || is_service_enabled tls-proxy; then
485
+    if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then
486 486
         # Use the BOTO_CONFIG environment variable to point to this file
487 487
         iniset $BOTO_CONF Boto ca_certificates_file $SSL_BUNDLE_FILE
488 488
         sudo chown $STACK_USER $BOTO_CONF