@@ -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;