diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-19 17:24:56 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-19 17:24:56 +0000 |
| commit | 87df3c1fca6771141fd045785e8118289e6503d6 (patch) | |
| tree | 8e67f899e80b0874740c96e00756d376726c5abe /mason.configure | |
| parent | 0f90d4a8219199f6941da600f173f96b06bc5a52 (diff) | |
| parent | f85eaa58f6e68dd1641246e68b8ab9e87a5b7633 (diff) | |
| download | definitions-87df3c1fca6771141fd045785e8118289e6503d6.tar.gz | |
Merge branch 'baserock/pedroalvarez/fix-generic-mason'
Reviewed-by:
- Richard Maw
- Francisco Redondo Marchena
Diffstat (limited to 'mason.configure')
| -rw-r--r-- | mason.configure | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/mason.configure b/mason.configure index 621d6a31..1198ebd0 100644 --- a/mason.configure +++ b/mason.configure @@ -32,36 +32,6 @@ set -e - -########################################################################## -# Check variables -########################################################################## - -if [ -n "$MASON_GENERIC" ]; then - echo Not configuring Mason, it will be generic - exit 0 -fi - -if [ -z "$MASON_CLUSTER_MORPHOLOGY" -a \ - -z "$MASON_DEFINITIONS_REF" -a \ - -z "$MASON_DISTBUILD_ARCH" -a \ - -z "$MASON_TEST_HOST" ]; then - # No Mason options defined, do nothing. - exit 0 -fi - -if [ -z "$ARTIFACT_CACHE_SERVER" -o \ - -z "$CONTROLLERHOST" -o \ - -z "$MASON_CLUSTER_MORPHOLOGY" -o \ - -z "$MASON_DEFINITIONS_REF" -o \ - -z "$MASON_DISTBUILD_ARCH" -o \ - -z "$MASON_TEST_HOST" -o \ - -z "$TROVE_HOST" -o \ - -z "$TROVE_ID" ]; then - echo Some options required for Mason were defined, but not all. - exit 1 -fi - ########################################################################## # Copy Mason files into root filesystem ########################################################################## @@ -104,6 +74,34 @@ cp mason/mason-setup.service "$ROOT"/etc/systemd/system/mason-setup.service ln -s ../mason-setup.service "$ROOT"/etc/systemd/system/multi-user.target.wants/mason-setup.service +########################################################################## +# Check variables +########################################################################## + +if [ -n "$MASON_GENERIC" ]; then + echo Not configuring Mason, it will be generic + exit 0 +fi + +if [ -z "$MASON_CLUSTER_MORPHOLOGY" -a \ + -z "$MASON_DEFINITIONS_REF" -a \ + -z "$MASON_DISTBUILD_ARCH" -a \ + -z "$MASON_TEST_HOST" ]; then + # No Mason options defined, do nothing. + exit 0 +fi + +if [ -z "$ARTIFACT_CACHE_SERVER" -o \ + -z "$CONTROLLERHOST" -o \ + -z "$MASON_CLUSTER_MORPHOLOGY" -o \ + -z "$MASON_DEFINITIONS_REF" -o \ + -z "$MASON_DISTBUILD_ARCH" -o \ + -z "$MASON_TEST_HOST" -o \ + -z "$TROVE_HOST" -o \ + -z "$TROVE_ID" ]; then + echo Some options required for Mason were defined, but not all. + exit 1 +fi ########################################################################## # Generate config variable shell snippet @@ -132,7 +130,7 @@ yaml.dump(mason_configuration, sys.stdout, default_flow_style=False) EOF if [ "$TEST_INFRASTRUCTURE_TYPE" = "openstack" ]; then - python <<'EOF' >"$MASON_DATA/os.conf" + python <<'EOF' >>"$MASON_DATA/mason.conf" import os, sys, yaml openstack_credentials={ |