openstack/devstack
Code Issues Proposed changes

Merge "Configure boto.cfg in tempest to point to SSL bundle"

Browse Source
This commit is contained in:
Jenkins 2014-12-09 17:24:30 +00:00 committed by Gerrit Code Review
commit b23cdf294b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tempest
View File

@ -63,6 +63,7 @@ BUILD_TIMEOUT=${BUILD_TIMEOUT:-196}
BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-${CIRROS_VERSION}" BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-${CIRROS_VERSION}"
BOTO_CONF=$TEMPEST_DIR/boto.cfg
# Cinder/Volume variables # Cinder/Volume variables
TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default} TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default}
@ -424,6 +425,12 @@ function configure_tempest {
fi fi
done done
if is_ssl_enabled_service "keystone" || 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
fi
# Restore IFS # Restore IFS
IFS=$ifs IFS=$ifs
} }