diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-15 08:36:54 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-27 09:09:20 +0000 |
| commit | d975746c51ec75b0aa6d2f49d4922fd1de67181e (patch) | |
| tree | 205650c3637f7bd816780bd1bef52c3e632d7574 /mason/ansible/mason-setup.yml | |
| parent | f199ddc09831e8eb0111069f3495de8c1bd71471 (diff) | |
| download | definitions-d975746c51ec75b0aa6d2f49d4922fd1de67181e.tar.gz | |
Make mason.conf contain everything it needs to
This adds TEST_INFRASTRUCTURE_TYPE and OPENSTACK_NETWORK_ID to
mason.conf, as well as ending the confusion of using both
MASON_TEST_HOST and TEST_VM_HOST_SSH_URL to mean the same thing
in different places.
Diffstat (limited to 'mason/ansible/mason-setup.yml')
| -rw-r--r-- | mason/ansible/mason-setup.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mason/ansible/mason-setup.yml b/mason/ansible/mason-setup.yml index 70c77871..3b73d6d5 100644 --- a/mason/ansible/mason-setup.yml +++ b/mason/ansible/mason-setup.yml @@ -29,6 +29,12 @@ - fail: msg='CONTROLLERHOST is mandatory' when: CONTROLLERHOST is not defined + - fail: msg='TEST_INFRASTRUCTURE_TYPE is mandatory' + when: TEST_INFRASTRUCTURE_TYPE is not defined + + - fail: msg='OPENSTACK_NETWORK_ID is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack' + when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OPENSTACK_NETWORK_ID is not defined + - name: Create the Mason configuration file template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }} with_items: |