diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-18 12:29:09 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-19 11:45:06 +0000 |
| commit | 603f40960c9b37fcedce6c78f7bd59d85559ae40 (patch) | |
| tree | 0d2ee249b4825051c3f1ec136241989718a8b760 /mason.configure | |
| parent | d38b006f062bdfc7aa0014e59d0e8894a35641ee (diff) | |
| download | definitions-603f40960c9b37fcedce6c78f7bd59d85559ae40.tar.gz | |
Check Mason variables after installing Mason files
This way, if the Mason system that is being deployed is generic,
it will contain the files needed to setup and run Mason.
Diffstat (limited to 'mason.configure')
| -rw-r--r-- | mason.configure | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/mason.configure b/mason.configure index 621d6a31..ec8bf7d8 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 |