summaryrefslogtreecommitdiff
path: root/mason/ansible/mason-setup.yml
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-05-20 09:44:05 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2015-05-20 09:44:05 +0000
commit4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994 (patch)
tree3e6c6e7fda3501b8af7aec03aff10e4e43130859 /mason/ansible/mason-setup.yml
parentfab1f7a06fa8a5a6be1fabaec0e565802de498fc (diff)
downloaddefinitions-4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994.tar.gz
Install configuration files in the correct place
Also, have a more sensible default layout.yaml.
Diffstat (limited to 'mason/ansible/mason-setup.yml')
-rw-r--r--mason/ansible/mason-setup.yml17
1 files changed, 12 insertions, 5 deletions
diff --git a/mason/ansible/mason-setup.yml b/mason/ansible/mason-setup.yml
index 66d38d81..d47439b5 100644
--- a/mason/ansible/mason-setup.yml
+++ b/mason/ansible/mason-setup.yml
@@ -70,14 +70,21 @@
- fail: msg='OS_AUTH_URL is mandatory when MASON_TEST_INFRASTRUCTURE_TYPE=openstack'
when: MASON_TEST_INFRASTRUCTURE_TYPE == "openstack" and OS_AUTH_URL is not defined
- - name: Create required configuration files
- template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }}
+ - name: Create Zuul configuration directory
+ file: path=/etc/zuul state=directory
+
+ - name: Create Zuul configuration files
+ template: src=/usr/share/mason-setup/zuul/{{ item }} dest=/etc/zuul/{{ item }}
with_items:
- zuul.conf
- - turbo-hipster-config.yaml
+ - layout.yaml
+ - logging.conf
+
+ - name: Create other required configuration files
+ template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }}
+ with_items:
- lighttpd.conf
- - zuul-layout.yaml
- - zuul-logging.conf
+ - turbo-hipster-config.yaml
- name: Create the OpenStack credentials file
template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }}