@@ -95,9 +95,13 @@ fi

 # copy every time, because the image UUIDS are going to change

 cp $TEMPEST_CONF.tpl $TEMPEST_CONF

-ADMIN_USERNAME=${ADMIN_USERNAME:-admin}

-ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}

-ADMIN_TENANT_NAME=${ADMIN_TENANT:-admin}

+COMPUTE_ADMIN_USERNAME=${ADMIN_USERNAME:-admin}

+COMPUTE_ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}

+COMPUTE_ADMIN_TENANT_NAME=${ADMIN_TENANT:-admin}

+

+IDENTITY_ADMIN_USERNAME=${ADMIN_USERNAME:-admin}

+IDENTITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}

+IDENTITY_ADMIN_TENANT_NAME=${ADMIN_TENANT:-admin}

 IDENTITY_USE_SSL=${IDENTITY_USE_SSL:-False}

 IDENTITY_HOST=${IDENTITY_HOST:-127.0.0.1}

@@ -107,6 +111,7 @@ IDENTITY_API_VERSION="v2.0" # Note: need v for now...

 # from the Tempest configuration file entirely...

 IDENTITY_PATH=${IDENTITY_PATH:-tokens}

 IDENTITY_STRATEGY=${IDENTITY_STRATEGY:-keystone}

+IDENTITY_CATALOG_TYPE=identity

 # We use regular, non-admin users in Tempest for the USERNAME

 # substitutions and use ADMIN_USERNAME et al for the admin stuff.

@@ -128,15 +133,26 @@ FLAVOR_REF_ALT=2

 # Do any of the following need to be configurable?

 COMPUTE_CATALOG_TYPE=compute

 COMPUTE_CREATE_IMAGE_ENABLED=True

+COMPUTE_ALLOW_TENANT_ISOLATION=True

 COMPUTE_RESIZE_AVAILABLE=False  # not supported with QEMU...

 COMPUTE_LOG_LEVEL=ERROR

-BUILD_INTERVAL=10

-BUILD_TIMEOUT=600

+BUILD_INTERVAL=3

+BUILD_TIMEOUT=400

+RUN_SSH=True

+SSH_USER=$OS_USERNAME

+NETWORK_FOR_SSH=private

+IP_VERSION_FOR_SSH=4

+SSH_TIMEOUT=4

 # Image test configuration options...

 IMAGE_HOST=${IMAGE_HOST:-127.0.0.1}

 IMAGE_PORT=${IMAGE_PORT:-9292}

-IMAGE_API_VERSION="1"

+IMAGE_API_VERSION=1

+IMAGE_CATALOG_TYPE=image

+

+# Network API test configuration

+NETWORK_CATALOG_TYPE=network

+NETWORK_API_VERSION=2.0

 sed -e "

     s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g;

@@ -145,6 +161,7 @@ sed -e "

     s,%IDENTITY_API_VERSION%,$IDENTITY_API_VERSION,g;

     s,%IDENTITY_PATH%,$IDENTITY_PATH,g;

     s,%IDENTITY_STRATEGY%,$IDENTITY_STRATEGY,g;

+    s,%IDENTITY_CATALOG_TYPE%,$IDENTITY_CATALOG_TYPE,g;

     s,%USERNAME%,$OS_USERNAME,g;

     s,%PASSWORD%,$OS_PASSWORD,g;

     s,%TENANT_NAME%,$OS_TENANT_NAME,g;

@@ -152,11 +169,17 @@ sed -e "

     s,%ALT_PASSWORD%,$ALT_PASSWORD,g;

     s,%ALT_TENANT_NAME%,$ALT_TENANT_NAME,g;

     s,%COMPUTE_CATALOG_TYPE%,$COMPUTE_CATALOG_TYPE,g;

+    s,%COMPUTE_ALLOW_TENANT_ISOLATION%,$COMPUTE_ALLOW_TENANT_ISOLATION,g;

     s,%COMPUTE_CREATE_IMAGE_ENABLED%,$COMPUTE_CREATE_IMAGE_ENABLED,g;

     s,%COMPUTE_RESIZE_AVAILABLE%,$COMPUTE_RESIZE_AVAILABLE,g;

     s,%COMPUTE_LOG_LEVEL%,$COMPUTE_LOG_LEVEL,g;

     s,%BUILD_INTERVAL%,$BUILD_INTERVAL,g;

     s,%BUILD_TIMEOUT%,$BUILD_TIMEOUT,g;

+    s,%RUN_SSH%,$RUN_SSH,g;

+    s,%SSH_USER%,$SSH_USER,g;

+    s,%NETWORK_FOR_SSH%,$NETWORK_FOR_SSH,g;

+    s,%IP_VERSION_FOR_SSH%,$IP_VERSION_FOR_SSH,g;

+    s,%SSH_TIMEOUT%,$SSH_TIMEOUT,g;

     s,%IMAGE_ID%,$IMAGE_UUID,g;

     s,%IMAGE_ID_ALT%,$IMAGE_UUID_ALT,g;

     s,%FLAVOR_REF%,$FLAVOR_REF,g;

@@ -164,13 +187,15 @@ sed -e "

     s,%IMAGE_HOST%,$IMAGE_HOST,g;

     s,%IMAGE_PORT%,$IMAGE_PORT,g;

     s,%IMAGE_API_VERSION%,$IMAGE_API_VERSION,g;

-    s,%COMPUTE_ADMIN_USERNAME%,$ADMIN_USERNAME,g;

-    s,%COMPUTE_ADMIN_PASSWORD%,$ADMIN_PASSWORD,g;

-    s,%COMPUTE_ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g;

-    s,%IDENTITY_ADMIN_USERNAME%,$ADMIN_USERNAME,g;

-    s,%IDENTITY_ADMIN_PASSWORD%,$ADMIN_PASSWORD,g;

-    s,%IDENTITY_ADMIN_TENANT_NAME%,$ADMIN_TENANT_NAME,g;

-    s,%COMPUTE_ALLOW_TENANT_ISOLATION%,true,g;

+    s,%IMAGE_CATALOG_TYPE%,$IMAGE_CATALOG_TYPE,g;

+    s,%COMPUTE_ADMIN_USERNAME%,$COMPUTE_ADMIN_USERNAME,g;

+    s,%COMPUTE_ADMIN_PASSWORD%,$COMPUTE_ADMIN_PASSWORD,g;

+    s,%COMPUTE_ADMIN_TENANT_NAME%,$COMPUTE_ADMIN_TENANT_NAME,g;

+    s,%IDENTITY_ADMIN_USERNAME%,$IDENTITY_ADMIN_USERNAME,g;

+    s,%IDENTITY_ADMIN_PASSWORD%,$IDENTITY_ADMIN_PASSWORD,g;

+    s,%IDENTITY_ADMIN_TENANT_NAME%,$IDENTITY_ADMIN_TENANT_NAME,g;

+    s,%NETWORK_CATALOG_TYPE%,$NETWORK_CATALOG_TYPE,g;

+    s,%NETWORK_API_VERSION%,$NETWORK_API_VERSION,g;

 " -i $TEMPEST_CONF

 echo "Created tempest configuration file:"