diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-15 08:36:54 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-27 09:09:20 +0000 |
| commit | d975746c51ec75b0aa6d2f49d4922fd1de67181e (patch) | |
| tree | 205650c3637f7bd816780bd1bef52c3e632d7574 /mason/mason.sh | |
| parent | f199ddc09831e8eb0111069f3495de8c1bd71471 (diff) | |
| download | definitions-d975746c51ec75b0aa6d2f49d4922fd1de67181e.tar.gz | |
Make mason.conf contain everything it needs to
This adds TEST_INFRASTRUCTURE_TYPE and OPENSTACK_NETWORK_ID to
mason.conf, as well as ending the confusion of using both
MASON_TEST_HOST and TEST_VM_HOST_SSH_URL to mean the same thing
in different places.
Diffstat (limited to 'mason/mason.sh')
| -rwxr-xr-x | mason/mason.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mason/mason.sh b/mason/mason.sh index 7b56b8cc..4356e818 100755 --- a/mason/mason.sh +++ b/mason/mason.sh @@ -64,14 +64,14 @@ fi if [ "$TEST_INFRASTRUCTURE_TYPE" = "openstack" ]; then "scripts/release-test-os" \ - --deployment-host "$DISTBUILD_ARCH":"$TEST_VM_HOST_SSH_URL" \ + --deployment-host "$DISTBUILD_ARCH":"$MASON_TEST_HOST" \ --trove-host "$UPSTREAM_TROVE_ADDRESS" \ --trove-id "$TROVE_ID" \ --net-id "$OPENSTACK_NETWORK_ID" \ "$BUILD_CLUSTER_MORPHOLOGY" elif [ "$TEST_INFRASTRUCTURE_TYPE" = "kvmhost" ]; then "scripts/release-test" \ - --deployment-host "$DISTBUILD_ARCH":"$TEST_VM_HOST_SSH_URL" \ + --deployment-host "$DISTBUILD_ARCH":"$MASON_TEST_HOST" \ --trove-host "$UPSTREAM_TROVE_ADDRESS" \ --trove-id "$TROVE_ID" \ "$BUILD_CLUSTER_MORPHOLOGY" |