From f85eaa58f6e68dd1641246e68b8ab9e87a5b7633 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mason.configure') 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={ -- cgit v1.2.1