Adds the following options to the tempest configuration
file:
COMPUTE_CONFIG_PATH
COMPUTE_SOURCE_DIR
COMPUTE_WHITEBOX_ENABLED
COMPUTE_PATH_TO_PRIVATE_KEY
COMPUTE_DB_URI
COMPUTE_BIN_DIR
These options are used in an upcoming Tempest patchset
Change-Id: I50409d03255b92f154112b57e96ad71f8542ac96
| ... | ... |
@@ -52,6 +52,7 @@ source $TOP_DIR/openrc |
| 52 | 52 |
# Where Openstack code lives |
| 53 | 53 |
DEST=${DEST:-/opt/stack}
|
| 54 | 54 |
|
| 55 |
+NOVA_SOURCE_DIR=$DEST/nova |
|
| 55 | 56 |
TEMPEST_DIR=$DEST/tempest |
| 56 | 57 |
CONFIG_DIR=$TEMPEST_DIR/etc |
| 57 | 58 |
TEMPEST_CONF=$CONFIG_DIR/tempest.conf |
| ... | ... |
@@ -134,7 +135,7 @@ FLAVOR_REF_ALT=2 |
| 134 | 134 |
COMPUTE_CATALOG_TYPE=compute |
| 135 | 135 |
COMPUTE_CREATE_IMAGE_ENABLED=True |
| 136 | 136 |
COMPUTE_ALLOW_TENANT_ISOLATION=True |
| 137 |
-COMPUTE_RESIZE_AVAILABLE=False # not supported with QEMU... |
|
| 137 |
+COMPUTE_RESIZE_AVAILABLE=False |
|
| 138 | 138 |
COMPUTE_CHANGE_PASSWORD_AVAILABLE=False # not supported with QEMU... |
| 139 | 139 |
COMPUTE_LOG_LEVEL=ERROR |
| 140 | 140 |
BUILD_INTERVAL=3 |
| ... | ... |
@@ -144,6 +145,15 @@ SSH_USER=$OS_USERNAME |
| 144 | 144 |
NETWORK_FOR_SSH=private |
| 145 | 145 |
IP_VERSION_FOR_SSH=4 |
| 146 | 146 |
SSH_TIMEOUT=4 |
| 147 |
+# Whitebox testing configuration for Compute... |
|
| 148 |
+COMPUTE_WHITEBOX_ENABLED=True |
|
| 149 |
+COMPUTE_SOURCE_DIR=$NOVA_SOURCE_DIR |
|
| 150 |
+COMPUTE_BIN_DIR=/usr/bin/nova |
|
| 151 |
+COMPUTE_CONFIG_PATH=/etc/nova/nova.conf |
|
| 152 |
+# TODO(jaypipes): Create the key file here... right now, no whitebox |
|
| 153 |
+# tests actually use a key. |
|
| 154 |
+COMPUTE_PATH_TO_PRIVATE_KEY=$TEMPEST_DIR/id_rsa |
|
| 155 |
+COMPUTE_DB_URI=mysql://root:$MYSQL_PASSWORD@localhost/nova |
|
| 147 | 156 |
|
| 148 | 157 |
# Image test configuration options... |
| 149 | 158 |
IMAGE_HOST=${IMAGE_HOST:-127.0.0.1}
|
| ... | ... |
@@ -177,6 +187,7 @@ sed -e " |
| 177 | 177 |
s,%COMPUTE_CREATE_IMAGE_ENABLED%,$COMPUTE_CREATE_IMAGE_ENABLED,g; |
| 178 | 178 |
s,%COMPUTE_RESIZE_AVAILABLE%,$COMPUTE_RESIZE_AVAILABLE,g; |
| 179 | 179 |
s,%COMPUTE_CHANGE_PASSWORD_AVAILABLE%,$COMPUTE_CHANGE_PASSWORD_AVAILABLE,g; |
| 180 |
+ s,%COMPUTE_WHITEBOX_ENABLED%,$COMPUTE_WHITEBOX_ENABLED,g; |
|
| 180 | 181 |
s,%COMPUTE_LOG_LEVEL%,$COMPUTE_LOG_LEVEL,g; |
| 181 | 182 |
s,%BUILD_INTERVAL%,$BUILD_INTERVAL,g; |
| 182 | 183 |
s,%BUILD_TIMEOUT%,$BUILD_TIMEOUT,g; |
| ... | ... |
@@ -189,6 +200,11 @@ sed -e " |
| 189 | 189 |
s,%IMAGE_ID_ALT%,$IMAGE_UUID_ALT,g; |
| 190 | 190 |
s,%FLAVOR_REF%,$FLAVOR_REF,g; |
| 191 | 191 |
s,%FLAVOR_REF_ALT%,$FLAVOR_REF_ALT,g; |
| 192 |
+ s,%COMPUTE_CONFIG_PATH%,$COMPUTE_CONFIG_PATH,g; |
|
| 193 |
+ s,%COMPUTE_SOURCE_DIR%,$COMPUTE_SOURCE_DIR,g; |
|
| 194 |
+ s,%COMPUTE_BIN_DIR%,$COMPUTE_BIN_DIR,g; |
|
| 195 |
+ s,%COMPUTE_PATH_TO_PRIVATE_KEY%,$COMPUTE_PATH_TO_PRIVATE_KEY,g; |
|
| 196 |
+ s,%COMPUTE_DB_URI%,$COMPUTE_DB_URI,g; |
|
| 192 | 197 |
s,%IMAGE_HOST%,$IMAGE_HOST,g; |
| 193 | 198 |
s,%IMAGE_PORT%,$IMAGE_PORT,g; |
| 194 | 199 |
s,%IMAGE_API_VERSION%,$IMAGE_API_VERSION,g; |