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 From ee5a2bda0f645315376833c2ad91d7c3314c8c0b Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Mon, 20 Oct 2014 08:07:27 +0000 Subject: Use Ansible to generate config for OpenStack --- mason/ansible/mason-setup.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'mason/ansible/mason-setup.yml') diff --git a/mason/ansible/mason-setup.yml b/mason/ansible/mason-setup.yml index 3b73d6d5..08490e78 100644 --- a/mason/ansible/mason-setup.yml +++ b/mason/ansible/mason-setup.yml @@ -2,6 +2,7 @@ - hosts: localhost vars_files: - "/etc/mason/mason.conf" + - "/etc/mason/os.conf" tasks: @@ -35,11 +36,32 @@ - fail: msg='OPENSTACK_NETWORK_ID is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack' when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OPENSTACK_NETWORK_ID is not defined + - fail: msg='OS_USERNAME is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack' + when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_USERNAME is not defined + + - fail: msg='OS_PASSWORD is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack' + when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_PASSWORD is not defined + + - fail: msg='OS_TENANT_ID is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack' + when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_TENANT_ID is not defined + + - fail: msg='OS_TENANT_NAME is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack' + when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_TENANT_NAME is not defined + + - fail: msg='OS_AUTH_URL is mandatory when TEST_INFRASTRUCTURE_TYPE=openstack' + when: TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_AUTH_URL is not defined + - name: Create the Mason configuration file template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }} with_items: - mason.conf + - name: Create the OpenStack credentials file + template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }} + with_items: + - os.conf + when: TEST_INFRASTRUCTURE_TYPE == "openstack" + - name: Enable the mason service service: name=mason.service enabled=yes register: mason_service -- cgit v1.2.1