diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh index 456b3c0d10..4d029d841e 100755 --- a/tools/configure_tempest.sh +++ b/tools/configure_tempest.sh @@ -52,6 +52,7 @@ source $TOP_DIR/openrc # Where Openstack code lives DEST=${DEST:-/opt/stack} +NOVA_SOURCE_DIR=$DEST/nova TEMPEST_DIR=$DEST/tempest CONFIG_DIR=$TEMPEST_DIR/etc TEMPEST_CONF=$CONFIG_DIR/tempest.conf @@ -134,7 +135,7 @@ FLAVOR_REF_ALT=2 COMPUTE_CATALOG_TYPE=compute COMPUTE_CREATE_IMAGE_ENABLED=True COMPUTE_ALLOW_TENANT_ISOLATION=True -COMPUTE_RESIZE_AVAILABLE=False # not supported with QEMU... +COMPUTE_RESIZE_AVAILABLE=False COMPUTE_CHANGE_PASSWORD_AVAILABLE=False # not supported with QEMU... COMPUTE_LOG_LEVEL=ERROR BUILD_INTERVAL=3 @@ -144,6 +145,15 @@ SSH_USER=$OS_USERNAME NETWORK_FOR_SSH=private IP_VERSION_FOR_SSH=4 SSH_TIMEOUT=4 +# Whitebox testing configuration for Compute... +COMPUTE_WHITEBOX_ENABLED=True +COMPUTE_SOURCE_DIR=$NOVA_SOURCE_DIR +COMPUTE_BIN_DIR=/usr/bin/nova +COMPUTE_CONFIG_PATH=/etc/nova/nova.conf +# TODO(jaypipes): Create the key file here... right now, no whitebox +# tests actually use a key. +COMPUTE_PATH_TO_PRIVATE_KEY=$TEMPEST_DIR/id_rsa +COMPUTE_DB_URI=mysql://root:$MYSQL_PASSWORD@localhost/nova # Image test configuration options... IMAGE_HOST=${IMAGE_HOST:-127.0.0.1} @@ -177,6 +187,7 @@ sed -e " s,%COMPUTE_CREATE_IMAGE_ENABLED%,$COMPUTE_CREATE_IMAGE_ENABLED,g; s,%COMPUTE_RESIZE_AVAILABLE%,$COMPUTE_RESIZE_AVAILABLE,g; s,%COMPUTE_CHANGE_PASSWORD_AVAILABLE%,$COMPUTE_CHANGE_PASSWORD_AVAILABLE,g; + s,%COMPUTE_WHITEBOX_ENABLED%,$COMPUTE_WHITEBOX_ENABLED,g; s,%COMPUTE_LOG_LEVEL%,$COMPUTE_LOG_LEVEL,g; s,%BUILD_INTERVAL%,$BUILD_INTERVAL,g; s,%BUILD_TIMEOUT%,$BUILD_TIMEOUT,g; @@ -189,6 +200,11 @@ sed -e " s,%IMAGE_ID_ALT%,$IMAGE_UUID_ALT,g; s,%FLAVOR_REF%,$FLAVOR_REF,g; s,%FLAVOR_REF_ALT%,$FLAVOR_REF_ALT,g; + s,%COMPUTE_CONFIG_PATH%,$COMPUTE_CONFIG_PATH,g; + s,%COMPUTE_SOURCE_DIR%,$COMPUTE_SOURCE_DIR,g; + s,%COMPUTE_BIN_DIR%,$COMPUTE_BIN_DIR,g; + s,%COMPUTE_PATH_TO_PRIVATE_KEY%,$COMPUTE_PATH_TO_PRIVATE_KEY,g; + s,%COMPUTE_DB_URI%,$COMPUTE_DB_URI,g; s,%IMAGE_HOST%,$IMAGE_HOST,g; s,%IMAGE_PORT%,$IMAGE_PORT,g; s,%IMAGE_API_VERSION%,$IMAGE_API_VERSION,g;