openstack/devstack
Code Issues Proposed changes

Adds requisite changes to configure_tempest.sh for EC2/S3 tests

Browse Source 
* Adds all the BOTO_XXX variables to the configuration file
  setup that are needed by https://review.openstack.org/#/c/14689/15

Change-Id: I44b2950705807fcfd026f1069fbe0d2727632760
This commit is contained in:
Jay Pipes 2012-11-19 10:58:50 -05:00
parent 82b0bd8301
commit 596b906b63
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/configure_tempest.sh
View File

@ -209,6 +209,21 @@ 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}
# EC2 and S3 test configuration
BOTO_EC2_URL="http://$IDENTITY_HOST:8773/services/Cloud"
BOTO_S3_URL="http://$IDENTITY_HOST:3333"
BOTO_AWS_ACCESS="" # Created in tempest...
BOTO_AWS_SECRET="" # Created in tempest...
BOTO_AWS_REGION="RegionOne"
BOTO_S3_MATERIALS_PATH=$DEST/devstack/files/images/s3-materials/cirros-0.3.0
BOTO_ARI_MANIFEST=cirros-0.3.0-x86_64-initrd.manifest.xml
BOTO_AMI_MANIFEST=cirros-0.3.0-x86_64-blank.img.manifest.xml
BOTO_AKI_MANIFEST=cirros-0.3.0-x86_64-vmlinuz.manifest.xml
BOTO_FLAVOR_NAME=m1.tiny
BOTO_SOCKET_TIMEOUT=5
BOTO_BUILD_TIMEOUT=${COMPUTE_BUILD_TIMEOUT:-400}
BOTO_BUILD_INTERVAL=${COMPUTE_BUILD_INTERVAL:-3}
sed -e " sed -e "
s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g; s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g;
s,%IDENTITY_HOST%,$IDENTITY_HOST,g; s,%IDENTITY_HOST%,$IDENTITY_HOST,g;
@ -266,6 +281,19 @@ 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,%BOTO_EC2_URL%,$BOTO_EC2_URL,g;
s,%BOTO_S3_URL%,$BOTO_S3_URL,g;
s,%BOTO_AWS_ACCESS%,$BOTO_AWS_ACCESS,g;
s,%BOTO_AWS_SECRET%,$BOTO_AWS_SECRET,g;
s,%BOTO_AWS_REGION%,$BOTO_AWS_REGION,g;
s,%BOTO_S3_MATERIALS_PATH%,$BOTO_S3_MATERIALS_PATH,g;
s,%BOTO_ARI_MANIFEST%,$BOTO_ARI_MANIFEST,g;
s,%BOTO_AMI_MANIFEST%,$BOTO_AMI_MANIFEST,g;
s,%BOTO_AKI_MANIFEST%,$BOTO_AKI_MANIFEST,g;
s,%BOTO_FLAVOR_NAME%,$BOTO_FLAVOR_NAME,g;
s,%BOTO_SOCKET_TIMEOUT%,$BOTO_SOCKET_TIMEOUT,g;
s,%BOTO_BUILD_TIMEOUT%,$BOTO_BUILD_TIMEOUT,g;
s,%BOTO_BUILD_INTERVAL%,$BOTO_BUILD_INTERVAL,g;
" -i $TEMPEST_CONF " -i $TEMPEST_CONF
echo "Created tempest configuration file:" echo "Created tempest configuration file:"