diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-30 10:46:22 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-30 10:46:22 +0000 |
commit | b12b320e86a54d69aa9661f5bff95dfcac2c8b78 (patch) | |
tree | ca245e371ca040a6c86844bec33bd6fd7c9813a4 /mason.configure | |
parent | edf589f356930ab47a04fec39bfcf55bac10329c (diff) | |
parent | 02c02a6eb6b8a577d8a684d039c529e449646c8b (diff) | |
download | definitions-b12b320e86a54d69aa9661f5bff95dfcac2c8b78.tar.gz |
Merge branch 'baserock/sam/mason-deploy-fix'
Diffstat (limited to 'mason.configure')
-rw-r--r-- | mason.configure | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mason.configure b/mason.configure index 4341d8c0..4d11feb4 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={ - 'ARTIFACT_CACHE_SERVIER': os.environ['ARTIFACT_CACHE_SERVER'], +mason_configuration={ + 'ARTIFACT_CACHE_SERVER': 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 |