Replace layout config with main.yaml

With zuulv3 there is only a single configuration file now for
projects, no more external python files. Remove zuul_file_layout with
zuul_file_main_yaml.

Change-Id: I63d592999684b1437bb240405a62af0cc362e977
Depends-On: https://review.openstack.org/561475
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

defaults/main.yaml

@@ -24,11 +24,11 @@ zuul_user_name: zuul
 zuul_user_group: zuul
 zuul_user_home: /var/lib/zuul
 
-zuul_file_layout_dest: /etc/zuul/config/
+zuul_file_main_yaml_dest: /etc/zuul/main.yaml
-zuul_file_layout_group: "{{ zuul_user_group }}"
+zuul_file_main_yaml_group: "{{ zuul_user_group }}"
-zuul_file_layout_mode: 0755
+zuul_file_main_yaml_mode: 0644
-zuul_file_layout_owner: "{{ zuul_user_name }}"
+zuul_file_main_yaml_owner: "{{ zuul_user_name }}"
-zuul_file_layout_src: etc/zuul/config/
+zuul_file_main_yaml_src: etc/zuul/main.yaml
 
 zuul_file_gearman_logging_conf_dest: /etc/zuul/gearman-logging.conf
 zuul_file_gearman_logging_conf_group: "{{ zuul_user_group }}"

tasks/config.yaml

@@ -116,15 +116,17 @@
     src: "{{ zuul_file_web_logging_conf_src }}"
   register: zuul_file_web_logging_conf
 
-- name: Install layout configuration.
+- name: Install zuul main.yaml configuration.
   become: yes
-  copy:
+  template:
-    dest: "{{ zuul_file_layout_dest }}"
+    dest: "{{ zuul_file_main_yaml_dest }}"
-    group: "{{ zuul_file_layout_group }}"
+    group: "{{ zuul_file_main_yaml_group }}"
-    mode: "{{ zuul_file_layout_mode }}"
+    mode: "{{ zuul_file_main_yaml_mode }}"
-    owner: "{{ zuul_file_layout_owner }}"
+    owner: "{{ zuul_file_main_yaml_owner }}"
-    src: "{{ zuul_file_layout_src }}"
+    src: "{{ zuul_file_main_yaml_src }}"
-  register: zuul_file_layout
+  register: zuul_file_main_yaml
+  notify:
+    - Reload zuul-scheduler
 
 - name: Install zuul configuration.
   become: yes

templates/etc/zuul/zuul.conf

@@ -17,7 +17,7 @@ sshkey = /var/lib/zuul/.ssh/id_rsa
 user = zuul
 
 [scheduler]
-tenant_config = /etc/zuul/config/layout.yaml
+tenant_config = /etc/zuul/main.yaml
 log_config = /etc/zuul/scheduler-logging.conf
 pidfile = /var/run/zuul-scheduler/zuul-scheduler.pid
 state_dir = /var/lib/zuul

tests/playbooks/run.yaml

@@ -36,10 +36,10 @@
           - zuul_file_gearman_ssl_key
           - zuul_file_executor_logging_conf
           - zuul_file_fingergw_logging_conf
+          - zuul_file_main_yaml
           - zuul_file_merger_logging_conf
           - zuul_file_scheduler_logging_conf
           - zuul_file_web_logging_conf
-          - zuul_file_layout
           - zuul_file_zuul_conf
           - zuul_file_zuul_executor_service
           - zuul_file_zuul_executor_service_config
@@ -99,32 +99,19 @@
           - zuul_git_dest_stat.stat.isdir
       when: zuul_install_method == 'git'
 
-    - name: Register /etc/zuul/config/
+    - name: Register /etc/zuul/main.yaml
       stat:
-        path: /etc/zuul/config/
+        path: /etc/zuul/main.yaml
-      register: zuul_layout_stat
+      register: zuul_main_yaml_stat
 
-    - name: Assert zuul_layout_stat tests.
+    - name: Assert zuul_main_yaml_stat tests.
       assert:
         that:
-          - zuul_layout_stat.stat.exists
+          - zuul_main_yaml_stat.stat.exists
-          - zuul_layout_stat.stat.isdir
+          - zuul_main_yaml_stat.stat.isreg
-          - zuul_layout_stat.stat.pw_name == 'zuul-test'
+          - zuul_main_yaml_stat.stat.pw_name == 'zuul-test'
-          - zuul_layout_stat.stat.gr_name == 'zuul-test'
+          - zuul_main_yaml_stat.stat.gr_name == 'zuul-test'
-          - zuul_layout_stat.stat.mode == '0755'
+          - zuul_main_yaml_stat.stat.mode == '0644'
-
-    - name: Register /etc/zuul/config/layout.yaml
-      stat:
-        path: /etc/zuul/config/layout.yaml
-      register: zuul_layout_yaml_stat
-
-    - name: Assert zuul_layout_yaml_stat tests.
-      assert:
-        that:
-          - zuul_layout_yaml_stat.stat.exists
-          - zuul_layout_yaml_stat.stat.isreg
-          - zuul_layout_yaml_stat.stat.pw_name == 'zuul-test'
-          - zuul_layout_yaml_stat.stat.gr_name == 'zuul-test'
 
     - name: Register /etc/zuul/zuul.conf
       stat: