openstack/devstack
Code Issues Proposed changes

Add OBJECT_CATALOG_TYPE to tempest config

Browse Source 
* add OBJECT_CATALOG_TYPE

Change-Id: I776f7ce65e44ceef139e34a1b1aff52e069b90e6
This commit is contained in:
Attila Fazekas 2012-11-29 16:52:59 +01:00
parent a823ab4647
commit ed30160c04
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/configure_tempest.sh
View File

@ -209,6 +209,9 @@ VOLUME_CATALOG_TYPE=volume
LIVE_MIGRATION_AVAILABLE=${LIVE_MIGRATION_AVAILABLE:-False} LIVE_MIGRATION_AVAILABLE=${LIVE_MIGRATION_AVAILABLE:-False}
USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION=${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-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 # EC2 and S3 test configuration
BOTO_EC2_URL="http://$IDENTITY_HOST:8773/services/Cloud" BOTO_EC2_URL="http://$IDENTITY_HOST:8773/services/Cloud"
BOTO_S3_URL="http://$IDENTITY_HOST:3333" BOTO_S3_URL="http://$IDENTITY_HOST:3333"
@ -281,6 +284,7 @@ sed -e "
s,%VOLUME_BUILD_TIMEOUT%,$VOLUME_BUILD_TIMEOUT,g; s,%VOLUME_BUILD_TIMEOUT%,$VOLUME_BUILD_TIMEOUT,g;
s,%LIVE_MIGRATION_AVAILABLE%,$LIVE_MIGRATION_AVAILABLE,g; s,%LIVE_MIGRATION_AVAILABLE%,$LIVE_MIGRATION_AVAILABLE,g;
s,%USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION%,$USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION,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_EC2_URL%,$BOTO_EC2_URL,g;
s,%BOTO_S3_URL%,$BOTO_S3_URL,g; s,%BOTO_S3_URL%,$BOTO_S3_URL,g;
s,%BOTO_AWS_ACCESS%,$BOTO_AWS_ACCESS,g; s,%BOTO_AWS_ACCESS%,$BOTO_AWS_ACCESS,g;