openstack/devstack
Code Issues Proposed changes

Merge "Make required changes to tempest.conf build"

Browse Source
This commit is contained in:
Jenkins 2012-04-18 16:16:29 +00:00 committed by Gerrit Code Review
commit 9105368bb0
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/configure_tempest.sh
View File

@ -37,13 +37,18 @@ TOP_DIR=$(cd $TOOLS_DIR/..; pwd)
# Abort if localrc is not set # Abort if localrc is not set
if [ ! -e $TOP_DIR/localrc ]; then if [ ! -e $TOP_DIR/localrc ]; then
echo "You must have a localrc with ALL necessary passwords and configuration defined before proceeding." echo "You must have a localrc with necessary basic configuration defined before proceeding."
echo "See stack.sh for required passwords."
exit 1 exit 1
fi fi
# Source params # Abort if openrc is not set
source ./stackrc if [ ! -e $TOP_DIR/openrc ]; then
echo "You must have an openrc with ALL necessary passwords and credentials defined before proceeding."
exit 1
fi
# Source params. openrc sources stackrc which sources localrc
source $TOP_DIR/openrc
# Set defaults not configured by stackrc # Set defaults not configured by stackrc
TENANT=${TENANT:-admin} TENANT=${TENANT:-admin}
@ -132,8 +137,8 @@ if [[ ! -r $TEMPEST_CONF ]]; then
fi fi
IDENTITY_USE_SSL=${IDENTITY_USE_SSL:-False} IDENTITY_USE_SSL=${IDENTITY_USE_SSL:-False}
IDENTITY_PORT=${IDENTITY_PORT:-5000} TEMPEST_IDENTITY_HOST=${IDENTITY_HOST:-127.0.0.1}
IDENTITY_API_VERSION={$IDENTITY_API_VERSION:-v2.0} # Note: need v for now... TEMPEST_IDENTITY_API_VERSION="v2.0" # Note: need v for now...
# TODO(jaypipes): This is dumb and needs to be removed # TODO(jaypipes): This is dumb and needs to be removed
# from the Tempest configuration file entirely... # from the Tempest configuration file entirely...
IDENTITY_PATH=${IDENTITY_PATH:-tokens} IDENTITY_PATH=${IDENTITY_PATH:-tokens}
@ -167,14 +172,16 @@ ADMIN_TENANT_NAME={$ADMIN_TENANT:-admin}
# Do any of the following need to be configurable? # Do any of the following need to be configurable?
COMPUTE_CATALOG_TYPE=compute COMPUTE_CATALOG_TYPE=compute
COMPUTE_CREATE_IMAGE_ENABLED=True COMPUTE_CREATE_IMAGE_ENABLED=True
COMPUTE_RESIZE_AVAILABLE=True COMPUTE_RESIZE_AVAILABLE=False # not supported with QEMU...
COMPUTE_LOG_LEVEL=ERROR COMPUTE_LOG_LEVEL=ERROR
BUILD_INTERVAL=10
BUILD_TIMEOUT=600
sed -e " sed -e "
s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g; s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g;
s,%IDENTITY_HOST%,$HOST_IP,g; s,%IDENTITY_HOST%,$TEMPEST_IDENTITY_HOST,g;
s,%IDENTITY_PORT%,$IDENTITY_PORT,g; s,%IDENTITY_PORT%,$IDENTITY_PORT,g;
s,%IDENTITY_API_VERSION%,$IDENTITY_API_VERSION,g; s,%IDENTITY_API_VERSION%,$TEMPEST_IDENTITY_API_VERSION,g;
s,%IDENTITY_PATH%,$IDENTITY_PATH,g; s,%IDENTITY_PATH%,$IDENTITY_PATH,g;
s,%IDENTITY_STRATEGY%,$IDENTITY_STRATEGY,g; s,%IDENTITY_STRATEGY%,$IDENTITY_STRATEGY,g;
s,%USERNAME%,$OS_USERNAME,g; s,%USERNAME%,$OS_USERNAME,g;
@ -187,6 +194,8 @@ sed -e "
s,%COMPUTE_CREATE_IMAGE_ENABLED%,$COMPUTE_CREATE_IMAGE_ENABLED,g; s,%COMPUTE_CREATE_IMAGE_ENABLED%,$COMPUTE_CREATE_IMAGE_ENABLED,g;
s,%COMPUTE_RESIZE_AVAILABLE%,$COMPUTE_RESIZE_AVAILABLE,g; s,%COMPUTE_RESIZE_AVAILABLE%,$COMPUTE_RESIZE_AVAILABLE,g;
s,%COMPUTE_LOG_LEVEL%,$COMPUTE_LOG_LEVEL,g; s,%COMPUTE_LOG_LEVEL%,$COMPUTE_LOG_LEVEL,g;
s,%BUILD_INTERVAL%,$BUILD_INTERVAL,g;
s,%BUILD_TIMEOUT%,$BUILD_TIMEOUT,g;
s,%IMAGE_ID%,$IMAGE_UUID,g; s,%IMAGE_ID%,$IMAGE_UUID,g;
s,%IMAGE_ID_ALT%,$IMAGE_UUID_ALT,g; s,%IMAGE_ID_ALT%,$IMAGE_UUID_ALT,g;
s,%FLAVOR_REF%,$FLAVOR_REF,g; s,%FLAVOR_REF%,$FLAVOR_REF,g;
@ -196,6 +205,10 @@ sed -e "
s,%ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g; s,%ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g;
" -i $TEMPEST_CONF " -i $TEMPEST_CONF
echo "Created tempest configuration file:"
cat $TEMPEST_CONF
echo "\n\n"
# Create config.ini # Create config.ini
CONFIG_INI_TMP=$(mktemp $CONFIG_INI.XXXXXX) CONFIG_INI_TMP=$(mktemp $CONFIG_INI.XXXXXX)