From d975746c51ec75b0aa6d2f49d4922fd1de67181e Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Wed, 15 Oct 2014 08:36:54 +0000 Subject: 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. --- mason/ansible/mason-setup.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mason/ansible/mason-setup.yml') 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: -- cgit v1.2.1