From f3352d2907355b03ba9946abc9007e7259cb3689 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 18 Nov 2014 12:29:09 +0000
Subject: 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.
---
 mason.configure | 58 ++++++++++++++++++++++++++++-----------------------------
 1 file 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
-- 
cgit v1.2.1


From f85eaa58f6e68dd1641246e68b8ab9e87a5b7633 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 18 Nov 2014 13:56:08 +0000
Subject: Fix Mason deployments for non-openstack-testing Mason

In mason.configure:

It's not needed to create a separate os.conf file at this point.
In this file we were puting OpenStack credentials used to create
an os.conf file with Ansible. This file was only created when
TEST_INFRASTRUCTURE_TYPE was 'openstack', and Ansible was expecting
it always.

This patch moves the OpenStack credentials to mason.conf, so Ansible
only have to read the variables from one file.

In mason.sh:

The script was always loading /etc/os.conf. This file is only created
when TEST_INFRASTRUCTURE_TYPE is 'openstack'. This patch checks that
the file exists before loading it.

In mason.conf template for Ansible.

OPENSTACK_NETWORK_ID is only present when TEST_INFRASTRUCTURE_TYPE
is 'openstack'. This patch adds a conditon in the template to
skip this value if it doesn't exist.
---
 mason.configure               | 2 +-
 mason/ansible/mason-setup.yml | 1 -
 mason/mason.sh                | 4 +++-
 mason/share/mason.conf        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mason.configure b/mason.configure
index ec8bf7d8..1198ebd0 100644
--- a/mason.configure
+++ b/mason.configure
@@ -130,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={
diff --git a/mason/ansible/mason-setup.yml b/mason/ansible/mason-setup.yml
index 08490e78..d1528dbb 100644
--- a/mason/ansible/mason-setup.yml
+++ b/mason/ansible/mason-setup.yml
@@ -2,7 +2,6 @@
 - hosts: localhost
   vars_files:
   - "/etc/mason/mason.conf"
-  - "/etc/mason/os.conf"
   tasks:
 
 
diff --git a/mason/mason.sh b/mason/mason.sh
index 5d27b7cf..dba99dfa 100755
--- a/mason/mason.sh
+++ b/mason/mason.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # Load OpenStack credentials
-. /etc/os.conf
+if [ -f "/etc/os.conf" ]; then
+    . /etc/os.conf
+fi
 
 set -e
 set -x
diff --git a/mason/share/mason.conf b/mason/share/mason.conf
index abbf357a..1295ce84 100644
--- a/mason/share/mason.conf
+++ b/mason/share/mason.conf
@@ -11,4 +11,4 @@ TROVE_ID={{ TROVE_ID|quote }}
 BUILD_CLUSTER_MORPHOLOGY={{ MASON_CLUSTER_MORPHOLOGY|quote }}
 MASON_TEST_HOST={{ MASON_TEST_HOST|quote }}
 TEST_INFRASTRUCTURE_TYPE={{ TEST_INFRASTRUCTURE_TYPE|quote }}
-OPENSTACK_NETWORK_ID={{ OPENSTACK_NETWORK_ID|quote }}
+{% if OPENSTACK_NETWORK_ID is defined %}OPENSTACK_NETWORK_ID={{ OPENSTACK_NETWORK_ID|quote }}{% endif %}
-- 
cgit v1.2.1