summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-26 15:04:04 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-30 10:45:39 (GMT)
commit0a6d4ab158799268bca75a1760a27f9b8761ba0a (patch)
tree0060073d85a5ad0ae247eaf880cb360e89c64ed0
parented592ddf2e0379de98f939220ff5092f8b6e88bc (diff)
downloaddefinitions-0a6d4ab158799268bca75a1760a27f9b8761ba0a.tar.gz
Fix deploying a non-generic Mason
Fixed DISTBUILD_GENERIC check in distbuild.configure, and TROVE_ADMIN_NAME check in mason.configure Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
-rw-r--r--distbuild.configure3
-rw-r--r--mason.configure5
2 files changed, 3 insertions, 5 deletions
diff --git a/distbuild.configure b/distbuild.configure
index 7914810..d9b9fb8 100644
--- a/distbuild.configure
+++ b/distbuild.configure
@@ -40,13 +40,12 @@
set -e
-set -u
-
if [ -n "$DISTBUILD_GENERIC" ]; then
echo "Not configuring the distbuild node, it will be generic"
exit 0
fi
+set -u
# Check that all the variables needed are present:
diff --git a/mason.configure b/mason.configure
index 4341d8c..9573373 100644
--- a/mason.configure
+++ b/mason.configure
@@ -102,19 +102,18 @@ mkdir -p "$MASON_DATA"
python <<'EOF' >"$MASON_DATA/mason.conf"
import os, sys, yaml
-trove_configuration={
+mason_configuration={
'ARTIFACT_CACHE_SERVIER': os.environ['ARTIFACT_CACHE_SERVER'],
'MASON_CLUSTER_MORPHOLOGY': os.environ['MASON_CLUSTER_MORPHOLOGY'],
'MASON_DEFINITIONS_REF': os.environ['MASON_DEFINITIONS_REF'],
'MASON_DISTBUILD_ARCH': os.environ['MASON_DISTBUILD_ARCH'],
'MASON_TEST_HOST': os.environ['MASON_TEST_HOST'],
- 'TROVE_ADMIN_NAME': os.environ['TROVE_ADMIN_NAME'],
'TROVE_ID': os.environ['TROVE_ID'],
'TROVE_HOST': os.environ['TROVE_HOST'],
'CONTROLLERHOST': os.environ['CONTROLLERHOST'],
}
-yaml.dump(trove_configuration, sys.stdout, default_flow_style=False)
+yaml.dump(mason_configuration, sys.stdout, default_flow_style=False)
EOF