From 0a6d4ab158799268bca75a1760a27f9b8761ba0a Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 26 Sep 2014 15:04:04 +0000 Subject: 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 Reviewed-By: Paul Sherwood --- distbuild.configure | 3 +-- mason.configure | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/distbuild.configure b/distbuild.configure index 79148106..d9b9fb8a 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 4341d8c0..95733735 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 -- cgit v1.2.1