diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-28 10:02:57 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-28 10:02:57 +0000 |
| commit | 529cf76e1a276e6324ffa38eef71dcf7d700ad12 (patch) | |
| tree | 466be2587f655aea12ae426fa2345f928e401464 /mason.configure | |
| parent | 864cb7fe28e99f9bfec955e929e29dbd4d1045dd (diff) | |
| parent | e3097bdcc35588f4a7dcc99e399b0b492d9e12f4 (diff) | |
| download | definitions-529cf76e1a276e6324ffa38eef71dcf7d700ad12.tar.gz | |
Merge branch 'baserock/richardmaw/mason-loop-time'
Reviewed-by: Sam Thursfield
Reviewed-by: Michael Drake
Diffstat (limited to 'mason.configure')
| -rw-r--r-- | mason.configure | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mason.configure b/mason.configure index fb73b01c..90d49709 100644 --- a/mason.configure +++ b/mason.configure @@ -19,8 +19,8 @@ # a Mason instance at deployment time. It uses the following variables # from the environment: # +# * ARTIFACT_CACHE_SERVER # * MASON_CLUSTER_MORPHOLOGY -# * MASON_UPSTREAM_TROVE_ADDRESS # * MASON_DEFINITIONS_REF # * MASON_DISTBUILD_ARCH # * MASON_TEST_HOST @@ -32,8 +32,8 @@ set -e ROOT="$1" -if [ "$MASON_CLUSTER_MORPHOLOGY" = "" \ - -o "$MASON_UPSTREAM_TROVE_ADDRESS" = "" \ +if [ "$ARTIFACT_CACHE_SERVER" = "" \ + -o "$MASON_CLUSTER_MORPHOLOGY" = "" \ -o "$MASON_DEFINITIONS_REF" = "" \ -o "$MASON_DISTBUILD_ARCH" = "" \ -o "$MASON_TEST_HOST" = "" ]; then @@ -61,11 +61,11 @@ echo "Creating $MASON_CONFIG" cat >>"$MASON_CONFIG" <<EOF #################### START OF DEPLOY TIME CONFIGURATION ####################### -UPSTREAM_TROVE_ADDRESS=$(shellescape "$MASON_UPSTREAM_TROVE_ADDRESS") +ARTIFACT_CACHE_SERVER=$(shellescape "$ARTIFACT_CACHE_SERVER") +UPSTREAM_TROVE_ADDRESS=$(shellescape "$TROVE_HOST") DEFINITIONS_REF=$(shellescape "$MASON_DEFINITIONS_REF") DISTBUILD_ARCH=$(shellescape "$MASON_DISTBUILD_ARCH") DISTBUILD_CONTROLLER_ADDRESS=$(shellescape "$CONTROLLERHOST") -DISTBUILD_TROVE_ADDRESS=$(shellescape "$TROVE_HOST") TROVE_ID=$(shellescape "$TROVE_ID") BUILD_CLUSTER_MORPHOLOGY=$(shellescape "$MASON_CLUSTER_MORPHOLOGY") TEST_VM_HOST_SSH_URL=$(shellescape "$MASON_TEST_HOST") |