diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-27 09:10:48 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-27 09:10:48 +0000 |
| commit | 19d3ce76b9f785ee34457482415dee9bc4aaf9d2 (patch) | |
| tree | e2525d92184b752d7bdd9e87a862b11a848b850f /mason/share/mason.conf | |
| parent | 6b9c0c1ba8b23741349c535adf426a9e8a41d3c1 (diff) | |
| parent | b3a7c84e3dfb3385b7c5f5cc104ab2f6be278b91 (diff) | |
| download | definitions-19d3ce76b9f785ee34457482415dee9bc4aaf9d2.tar.gz | |
Merge branch 'baserock/adamcoldrick/mason-openstack-rebased'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'mason/share/mason.conf')
| -rw-r--r-- | mason/share/mason.conf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mason/share/mason.conf b/mason/share/mason.conf index b323896d..abbf357a 100644 --- a/mason/share/mason.conf +++ b/mason/share/mason.conf @@ -9,4 +9,6 @@ DISTBUILD_ARCH={{ MASON_DISTBUILD_ARCH|quote }} DISTBUILD_CONTROLLER_ADDRESS={{ CONTROLLERHOST|quote }} TROVE_ID={{ TROVE_ID|quote }} BUILD_CLUSTER_MORPHOLOGY={{ MASON_CLUSTER_MORPHOLOGY|quote }} -TEST_VM_HOST_SSH_URL={{ MASON_TEST_HOST|quote }} +MASON_TEST_HOST={{ MASON_TEST_HOST|quote }} +TEST_INFRASTRUCTURE_TYPE={{ TEST_INFRASTRUCTURE_TYPE|quote }} +OPENSTACK_NETWORK_ID={{ OPENSTACK_NETWORK_ID|quote }} |