Update zuul.conf template

Allow the user to override the location of the zuul.conf templaste.
Also added a few missing settings (layout_config).

Change-Id: I1c7674223146287396d5559bd4dee9eaa292f13c
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

defaults/main.yaml

@@ -29,12 +29,17 @@ zuul_config_merger_git_dir: /var/lib/zuul/git
 zuul_config_merger_log_config: /etc/zuul/merger-logging.conf
 zuul_config_merger_zuul_url: localhost
 
+zuul_config_zuul_layout_config: /etc/zuul/layout.yaml
 zuul_config_zuul_log_config: /etc/zuul/server-logging.conf
+zuul_config_zuul_state_dir: /var/lib/zuul
 
 zuul_file_gearman_logging_conf: etc/zuul/gearman-logging.conf
 zuul_file_merger_logging_conf: etc/zuul/merger-logging.conf
 zuul_file_server_logging_conf: etc/zuul/server-logging.conf
 
+zuul_template_zuul_conf_dest: /etc/zuul/zuul.conf
+zuul_template_zuul_conf_src: etc/zuul/zuul.conf.j2
+
 # tasks/install.yaml
 zuul_git_dest: /opt/git/openstack-infra/zuul
 zuul_git_uri: https://git.openstack.org/openstack-infra/zuul

tasks/config.yaml

@@ -30,8 +30,8 @@
 
 - name: Template zuul configuration file.
   template:
-    dest: /etc/zuul/zuul.conf
-    src: zuul.conf.j2
+    dest: "{{ zuul_template_zuul_conf_dest }}"
+    src: "{{ zuul_template_zuul_conf_src }}"
   notify: Restart zuul-server
 
 - name: Copy gearman logging file.

templates/etc/zuul/zuul.conf.j2

@@ -14,8 +14,9 @@ sshkey = {{ zuul_config_gerrit_sshkey }}
 user = {{ zuul_config_gerrit_user }}
 
 [zuul]
+layout_config = {{ zuul_config_zuul_layout_config }}
 log_config = {{ zuul_config_zuul_log_config }}
-state_dir = /var/lib/zuul
+state_dir = {{ zuul_config_zuul_state_dir }}
 
 [merger]
 git_dir = {{ zuul_config_merger_git_dir }}