From ed30160c0454bcd7c203db0f331e2adfcbd62ea3 Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Thu, 29 Nov 2012 16:52:59 +0100 Subject: [PATCH] Add OBJECT_CATALOG_TYPE to tempest config * add OBJECT_CATALOG_TYPE Change-Id: I776f7ce65e44ceef139e34a1b1aff52e069b90e6 --- tools/configure_tempest.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh index 9b543ab0d1..03dc683949 100755 --- a/tools/configure_tempest.sh +++ b/tools/configure_tempest.sh @@ -209,6 +209,9 @@ VOLUME_CATALOG_TYPE=volume LIVE_MIGRATION_AVAILABLE=${LIVE_MIGRATION_AVAILABLE:-False} USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION=${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False} +# Object Storage +OBJECT_CATALOG_TYPE="object-store" + # EC2 and S3 test configuration BOTO_EC2_URL="http://$IDENTITY_HOST:8773/services/Cloud" BOTO_S3_URL="http://$IDENTITY_HOST:3333" @@ -281,6 +284,7 @@ sed -e " s,%VOLUME_BUILD_TIMEOUT%,$VOLUME_BUILD_TIMEOUT,g; s,%LIVE_MIGRATION_AVAILABLE%,$LIVE_MIGRATION_AVAILABLE,g; s,%USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION%,$USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION,g; + s,%OBJECT_CATALOG_TYPE%,$OBJECT_CATALOG_TYPE,g; s,%BOTO_EC2_URL%,$BOTO_EC2_URL,g; s,%BOTO_S3_URL%,$BOTO_S3_URL,g; s,%BOTO_AWS_ACCESS%,$BOTO_AWS_ACCESS,g;