openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2015-02-11 13:49:56 +00:00
committed by Gerrit Code Review
parent 9b215db569 e1d013f926
commit e196544e23
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/tempest
View File

@@ -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