summaryrefslogtreecommitdiff
path: root/mason.configure
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-10-15 08:36:54 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-10-27 09:09:20 +0000
commitd975746c51ec75b0aa6d2f49d4922fd1de67181e (patch)
tree205650c3637f7bd816780bd1bef52c3e632d7574 /mason.configure
parentf199ddc09831e8eb0111069f3495de8c1bd71471 (diff)
downloaddefinitions-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.configure')
-rw-r--r--mason.configure4
1 files changed, 4 insertions, 0 deletions
diff --git a/mason.configure b/mason.configure
index 4d11feb4..995e098b 100644
--- a/mason.configure
+++ b/mason.configure
@@ -24,6 +24,8 @@
# * MASON_DEFINITIONS_REF
# * MASON_DISTBUILD_ARCH
# * MASON_TEST_HOST
+# * OPENSTACK_NETWORK_ID
+# * TEST_INFRASTRUCTURE_TYPE
# * TROVE_HOST
# * TROVE_ID
# * CONTROLLERHOST
@@ -108,6 +110,8 @@ mason_configuration={
'MASON_DEFINITIONS_REF': os.environ['MASON_DEFINITIONS_REF'],
'MASON_DISTBUILD_ARCH': os.environ['MASON_DISTBUILD_ARCH'],
'MASON_TEST_HOST': os.environ['MASON_TEST_HOST'],
+ 'OPENSTACK_NETWORK_ID': os.environ['OPENSTACK_NETWORK_ID'],
+ 'TEST_INFRASTRUCTURE_TYPE': os.environ['TEST_INFRASTRUCTURE_TYPE'],
'TROVE_ID': os.environ['TROVE_ID'],
'TROVE_HOST': os.environ['TROVE_HOST'],
'CONTROLLERHOST': os.environ['CONTROLLERHOST'],