diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-09-15 14:39:24 +0100 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-09-15 14:39:24 +0100 |
commit | 1f483054682972377ceb689f0c78b17cb15e62d4 (patch) | |
tree | 290b4ecc0018e89e7ec57d4dc9c61dc4ade736f9 | |
parent | bdd6a8d9cd36b215b85cee507bc8919a689e0fe5 (diff) | |
download | definitions-baserock/richardipsum/mason-openstack.tar.gz |
-rw-r--r-- | mason.configure | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mason.configure b/mason.configure index 90d49709..b0876a3a 100644 --- a/mason.configure +++ b/mason.configure @@ -47,7 +47,7 @@ fi ########################################################################## shellescape() { - echo "'$(echo "$1" | sed -e "s/'/'\\''/g")'" + echo "'$(echo "$1" | sed -e "s/'/'\\\''/g")'" } @@ -61,6 +61,7 @@ echo "Creating $MASON_CONFIG" cat >>"$MASON_CONFIG" <<EOF #################### START OF DEPLOY TIME CONFIGURATION ####################### +TEST_INFRA="$TEST_INFRA" ARTIFACT_CACHE_SERVER=$(shellescape "$ARTIFACT_CACHE_SERVER") UPSTREAM_TROVE_ADDRESS=$(shellescape "$TROVE_HOST") DEFINITIONS_REF=$(shellescape "$MASON_DEFINITIONS_REF") @@ -69,6 +70,7 @@ DISTBUILD_CONTROLLER_ADDRESS=$(shellescape "$CONTROLLERHOST") TROVE_ID=$(shellescape "$TROVE_ID") BUILD_CLUSTER_MORPHOLOGY=$(shellescape "$MASON_CLUSTER_MORPHOLOGY") TEST_VM_HOST_SSH_URL=$(shellescape "$MASON_TEST_HOST") +OPENSTACK_NET_ID="$OPENSTACK_NET_ID" ##################### END OF DEPLOY TIME CONFIGURATION ######################## EOF |