diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-26 15:04:04 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-30 10:45:39 +0000 |
| commit | 0a6d4ab158799268bca75a1760a27f9b8761ba0a (patch) | |
| tree | 0060073d85a5ad0ae247eaf880cb360e89c64ed0 /mason.configure | |
| parent | ed592ddf2e0379de98f939220ff5092f8b6e88bc (diff) | |
| download | definitions-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>
Diffstat (limited to 'mason.configure')
| -rw-r--r-- | mason.configure | 5 |
1 files changed, 2 insertions, 3 deletions
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 |