diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-18 13:56:08 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-19 11:45:34 +0000 |
| commit | bf99d50427647fe915236ea1d26d52646edeb565 (patch) | |
| tree | 12e66945bd9e216e924479f74996443c23ade07e /mason/ansible/mason-setup.yml | |
| parent | 603f40960c9b37fcedce6c78f7bd59d85559ae40 (diff) | |
| download | definitions-bf99d50427647fe915236ea1d26d52646edeb565.tar.gz | |
Fix Mason deployments for non-openstack-testing Masonbaserock/pedroalvarez/fix-generic-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.
Diffstat (limited to 'mason/ansible/mason-setup.yml')
| -rw-r--r-- | mason/ansible/mason-setup.yml | 1 |
1 files changed, 0 insertions, 1 deletions
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: |