Per service configurations

It is now possible to make configuration changes per service.

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

defaults/main.yaml

@@ -73,18 +73,24 @@ zuul_pip_name: zuul
 #zuul_pip_virtualenv:
 
 # tasks/service.yaml
-zuul_file_zuul_service_config_group: root
-zuul_file_zuul_service_config_owner: root
-
 zuul_file_zuul_launcher_service_group: root
 zuul_file_zuul_launcher_service_owner: root
 
+zuul_file_zuul_launcher_service_config_group: root
+zuul_file_zuul_launcher_service_config_owner: root
+
 zuul_file_zuul_merger_service_group: root
 zuul_file_zuul_merger_service_owner: root
 
+zuul_file_zuul_merger_service_config_group: root
+zuul_file_zuul_merger_service_config_owner: root
+
 zuul_file_zuul_server_service_group: root
 zuul_file_zuul_server_service_owner: root
 
+zuul_file_zuul_server_service_config_group: root
+zuul_file_zuul_server_service_config_owner: root
+
 zuul_service_zuul_launcher_enabled: yes
 zuul_service_zuul_launcher_manage: true
 zuul_service_zuul_launcher_name: zuul-launcher

files/etc/default/zuul-server

@@ -0,0 +1,3 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#

files/etc/sysconfig/zuul-launcher

@@ -0,0 +1,3 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#

files/etc/sysconfig/zuul-merger

@@ -0,0 +1,3 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#

files/etc/sysconfig/zuul-server

@@ -0,0 +1,3 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#

files/etc/systemd/system/zuul-launcher.service

@@ -6,7 +6,7 @@ After=syslog.target network.target
 Type=simple
 User=zuul
 Group=zuul
-EnvironmentFile=-/etc/sysconfig/zuul
+EnvironmentFile=-/etc/sysconfig/zuul-launcher
 ExecStart=/usr/bin/zuul-launcher -d
 
 [Install]

files/etc/systemd/system/zuul-merger.service

@@ -6,7 +6,7 @@ After=syslog.target network.target
 Type=simple
 User=zuul
 Group=zuul
-EnvironmentFile=-/etc/sysconfig/zuul
+EnvironmentFile=-/etc/sysconfig/zuul-merger
 ExecStart=/usr/bin/zuul-merger -d
 
 [Install]

files/etc/systemd/system/zuul-server.service

@@ -6,7 +6,7 @@ After=syslog.target network.target
 Type=simple
 User=zuul
 Group=zuul
-EnvironmentFile=-/etc/sysconfig/zuul
+EnvironmentFile=-/etc/sysconfig/zuul-server
 ExecStart=/usr/bin/zuul-server -d
 ExecReload=/bin/kill -HUP $MAINPID
 

tasks/service.yaml

@@ -12,21 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Define zuul_file_zuul_service_config_dest.
-  set_fact:
-    zuul_file_zuul_service_config_dest: "{{ __zuul_file_zuul_service_config_dest }}"
-  when: zuul_file_zuul_service_config_dest is not defined
-
-- name: Define zuul_file_zuul_service_config_mode.
-  set_fact:
-    zuul_file_zuul_service_config_mode: "{{ __zuul_file_zuul_service_config_mode }}"
-  when: zuul_file_zuul_service_config_mode is not defined
-
-- name: Define zuul_file_zuul_service_config_src.
-  set_fact:
-    zuul_file_zuul_service_config_src: "{{ __zuul_file_zuul_service_config_src }}"
-  when: zuul_file_zuul_service_config_src is not defined
-
 - name: Define zuul_file_zuul_launcher_service_dest.
   set_fact:
     zuul_file_zuul_launcher_service_dest: "{{ __zuul_file_zuul_launcher_service_dest }}"
@@ -42,6 +27,21 @@
     zuul_file_zuul_launcher_service_src: "{{ __zuul_file_zuul_launcher_service_src }}"
   when: zuul_file_zuul_launcher_service_src is not defined
 
+- name: Define zuul_file_zuul_launcher_service_config_dest.
+  set_fact:
+    zuul_file_zuul_launcher_service_config_dest: "{{ __zuul_file_zuul_launcher_service_config_dest }}"
+  when: zuul_file_zuul_launcher_service_config_dest is not defined
+
+- name: Define zuul_file_zuul_launcher_service_config_mode.
+  set_fact:
+    zuul_file_zuul_launcher_service_config_mode: "{{ __zuul_file_zuul_launcher_service_config_mode }}"
+  when: zuul_file_zuul_launcher_service_config_mode is not defined
+
+- name: Define zuul_file_zuul_launcher_service_config_src.
+  set_fact:
+    zuul_file_zuul_launcher_service_config_src: "{{ __zuul_file_zuul_launcher_service_config_src }}"
+  when: zuul_file_zuul_launcher_service_config_src is not defined
+
 - name: Define zuul_file_zuul_merger_service_dest.
   set_fact:
     zuul_file_zuul_merger_service_dest: "{{ __zuul_file_zuul_merger_service_dest }}"
@@ -57,6 +57,21 @@
     zuul_file_zuul_merger_service_src: "{{ __zuul_file_zuul_merger_service_src }}"
   when: zuul_file_zuul_merger_service_src is not defined
 
+- name: Define zuul_file_zuul_merger_service_config_dest.
+  set_fact:
+    zuul_file_zuul_merger_service_config_dest: "{{ __zuul_file_zuul_merger_service_config_dest }}"
+  when: zuul_file_zuul_merger_service_config_dest is not defined
+
+- name: Define zuul_file_zuul_merger_service_config_mode.
+  set_fact:
+    zuul_file_zuul_merger_service_config_mode: "{{ __zuul_file_zuul_merger_service_config_mode }}"
+  when: zuul_file_zuul_merger_service_config_mode is not defined
+
+- name: Define zuul_file_zuul_merger_service_config_src.
+  set_fact:
+    zuul_file_zuul_merger_service_config_src: "{{ __zuul_file_zuul_merger_service_config_src }}"
+  when: zuul_file_zuul_merger_service_config_src is not defined
+
 - name: Define zuul_file_zuul_server_service_dest.
   set_fact:
     zuul_file_zuul_server_service_dest: "{{ __zuul_file_zuul_server_service_dest }}"
@@ -72,14 +87,20 @@
     zuul_file_zuul_server_service_src: "{{ __zuul_file_zuul_server_service_src }}"
   when: zuul_file_zuul_server_service_src is not defined
 
-- name: Copy zuul service config into place.
+- name: Define zuul_file_zuul_server_service_config_dest.
-  become: yes
+  set_fact:
-  copy:
+    zuul_file_zuul_server_service_config_dest: "{{ __zuul_file_zuul_server_service_config_dest }}"
-    dest: "{{ zuul_file_zuul_service_config_dest }}"
+  when: zuul_file_zuul_server_service_config_dest is not defined
-    group: "{{ zuul_file_zuul_service_config_group }}"
+
-    mode: "{{ zuul_file_zuul_service_config_mode }}"
+- name: Define zuul_file_zuul_server_service_config_mode.
-    owner: "{{ zuul_file_zuul_service_config_owner }}"
+  set_fact:
-    src: "{{ zuul_file_zuul_service_config_src }}"
+    zuul_file_zuul_server_service_config_mode: "{{ __zuul_file_zuul_server_service_config_mode }}"
+  when: zuul_file_zuul_server_service_config_mode is not defined
+
+- name: Define zuul_file_zuul_server_service_config_src.
+  set_fact:
+    zuul_file_zuul_server_service_config_src: "{{ __zuul_file_zuul_server_service_config_src }}"
+  when: zuul_file_zuul_server_service_config_src is not defined
 
 - name: Copy zuul-launcher service into place.
   become: yes
@@ -90,6 +111,15 @@
     owner: "{{ zuul_file_zuul_launcher_service_owner }}"
     src: "{{ zuul_file_zuul_launcher_service_src }}"
 
+- name: Copy zuul-launcher service config into place.
+  become: yes
+  copy:
+    dest: "{{ zuul_file_zuul_launcher_service_config_dest }}"
+    group: "{{ zuul_file_zuul_launcher_service_config_group }}"
+    mode: "{{ zuul_file_zuul_launcher_service_config_mode }}"
+    owner: "{{ zuul_file_zuul_launcher_service_config_owner }}"
+    src: "{{ zuul_file_zuul_launcher_service_config_src }}"
+
 - name: Copy zuul-merger service into place.
   become: yes
   copy:
@@ -99,6 +129,15 @@
     owner: "{{ zuul_file_zuul_merger_service_owner }}"
     src: "{{ zuul_file_zuul_merger_service_src }}"
 
+- name: Copy zuul-merger service config into place.
+  become: yes
+  copy:
+    dest: "{{ zuul_file_zuul_merger_service_config_dest }}"
+    group: "{{ zuul_file_zuul_merger_service_config_group }}"
+    mode: "{{ zuul_file_zuul_merger_service_config_mode }}"
+    owner: "{{ zuul_file_zuul_merger_service_config_owner }}"
+    src: "{{ zuul_file_zuul_merger_service_config_src }}"
+
 - name: Copy zuul-server service into place.
   become: yes
   copy:
@@ -108,6 +147,15 @@
     owner: "{{ zuul_file_zuul_server_service_owner }}"
     src: "{{ zuul_file_zuul_server_service_src }}"
 
+- name: Copy zuul-server service config into place.
+  become: yes
+  copy:
+    dest: "{{ zuul_file_zuul_server_service_config_dest }}"
+    group: "{{ zuul_file_zuul_server_service_config_group }}"
+    mode: "{{ zuul_file_zuul_server_service_config_mode }}"
+    owner: "{{ zuul_file_zuul_server_service_config_owner }}"
+    src: "{{ zuul_file_zuul_server_service_config_src }}"
+
 - name: Enable zuul-launcher service.
   become: yes
   service:

tests/test.yaml

@@ -107,22 +107,6 @@
           - zuul_conf_stat.stat.pw_name == 'zuul'
           - zuul_conf_stat.stat.gr_name == 'zuul'
 
-    - name: Register /etc/default/zuul
-      stat:
-        path: /etc/default/zuul
-      register: debian_zuul_service_config_stat
-      when: ansible_os_family == 'Debian'
-
-    - name: Assert debian_zuul_service_config_stat tests.
-      assert:
-        that:
-          - debian_zuul_service_config_stat.stat.exists
-          - debian_zuul_service_config_stat.stat.isreg
-          - debian_zuul_service_config_stat.stat.pw_name == 'root'
-          - debian_zuul_service_config_stat.stat.gr_name == 'root'
-          - debian_zuul_service_config_stat.stat.mode == '0644'
-      when: ansible_os_family == 'Debian'
-
     - name: Register /etc/init.d/zuul-launcher
       stat:
         path: /etc/init.d/zuul-launcher
@@ -139,6 +123,22 @@
           - debian_zuul_launcher_service_stat.stat.mode == '0755'
       when: ansible_os_family == 'Debian'
 
+    - name: Register /etc/default/zuul-launcher
+      stat:
+        path: /etc/default/zuul-launcher
+      register: debian_zuul_launcher_service_config_stat
+      when: ansible_os_family == 'Debian'
+
+    - name: Assert debian_zuul_launcher_service_config_stat tests.
+      assert:
+        that:
+          - debian_zuul_launcher_service_config_stat.stat.exists
+          - debian_zuul_launcher_service_config_stat.stat.isreg
+          - debian_zuul_launcher_service_config_stat.stat.pw_name == 'root'
+          - debian_zuul_launcher_service_config_stat.stat.gr_name == 'root'
+          - debian_zuul_launcher_service_config_stat.stat.mode == '0644'
+      when: ansible_os_family == 'Debian'
+
     - name: Register /etc/init.d/zuul-merger
       stat:
         path: /etc/init.d/zuul-merger
@@ -155,6 +155,22 @@
           - debian_zuul_merger_service_stat.stat.mode == '0755'
       when: ansible_os_family == 'Debian'
 
+    - name: Register /etc/default/zuul-merger
+      stat:
+        path: /etc/default/zuul-merger
+      register: debian_zuul_merger_service_config_stat
+      when: ansible_os_family == 'Debian'
+
+    - name: Assert debian_zuul_merger_service_config_stat tests.
+      assert:
+        that:
+          - debian_zuul_merger_service_config_stat.stat.exists
+          - debian_zuul_merger_service_config_stat.stat.isreg
+          - debian_zuul_merger_service_config_stat.stat.pw_name == 'root'
+          - debian_zuul_merger_service_config_stat.stat.gr_name == 'root'
+          - debian_zuul_merger_service_config_stat.stat.mode == '0644'
+      when: ansible_os_family == 'Debian'
+
     - name: Register /etc/init.d/zuul-server
       stat:
         path: /etc/init.d/zuul-server
@@ -171,21 +187,21 @@
           - debian_zuul_server_service_stat.stat.mode == '0755'
       when: ansible_os_family == 'Debian'
 
-    - name: Register /etc/sysconfig/zuul
+    - name: Register /etc/default/zuul-server
       stat:
-        path: /etc/sysconfig/zuul
+        path: /etc/default/zuul-server
-      register: redhat_zuul_service_config_stat
+      register: debian_zuul_server_service_config_stat
-      when: ansible_os_family == 'RedHat'
+      when: ansible_os_family == 'Debian'
 
-    - name: Assert redhat_zuul_service_config_stat tests.
+    - name: Assert debian_zuul_server_service_config_stat tests.
       assert:
         that:
-          - redhat_zuul_service_config_stat.stat.exists
+          - debian_zuul_server_service_config_stat.stat.exists
-          - redhat_zuul_service_config_stat.stat.isreg
+          - debian_zuul_server_service_config_stat.stat.isreg
-          - redhat_zuul_service_config_stat.stat.pw_name == 'root'
+          - debian_zuul_server_service_config_stat.stat.pw_name == 'root'
-          - redhat_zuul_service_config_stat.stat.gr_name == 'root'
+          - debian_zuul_server_service_config_stat.stat.gr_name == 'root'
-          - redhat_zuul_service_config_stat.stat.mode == '0644'
+          - debian_zuul_server_service_config_stat.stat.mode == '0644'
-      when: ansible_os_family == 'RedHat'
+      when: ansible_os_family == 'Debian'
 
     - name: Register /etc/systemd/system/zuul-launcher.service
       stat:
@@ -203,6 +219,22 @@
           - redhat_zuul_launcher_service_stat.stat.mode == '0644'
       when: ansible_os_family == 'RedHat'
 
+    - name: Register /etc/sysconfig/zuul-launcher
+      stat:
+        path: /etc/sysconfig/zuul-launcher
+      register: redhat_zuul_launcher_service_config_stat
+      when: ansible_os_family == 'RedHat'
+
+    - name: Assert redhat_zuul_launcher_service_config_stat tests.
+      assert:
+        that:
+          - redhat_zuul_launcher_service_config_stat.stat.exists
+          - redhat_zuul_launcher_service_config_stat.stat.isreg
+          - redhat_zuul_launcher_service_config_stat.stat.pw_name == 'root'
+          - redhat_zuul_launcher_service_config_stat.stat.gr_name == 'root'
+          - redhat_zuul_launcher_service_config_stat.stat.mode == '0644'
+      when: ansible_os_family == 'RedHat'
+
     - name: Register /etc/systemd/system/zuul-merger.service
       stat:
         path: /etc/systemd/system/zuul-merger.service
@@ -219,6 +251,22 @@
           - redhat_zuul_merger_service_stat.stat.mode == '0644'
       when: ansible_os_family == 'RedHat'
 
+    - name: Register /etc/sysconfig/zuul-merger
+      stat:
+        path: /etc/sysconfig/zuul-merger
+      register: redhat_zuul_merger_service_config_stat
+      when: ansible_os_family == 'RedHat'
+
+    - name: Assert redhat_zuul_merger_service_config_stat tests.
+      assert:
+        that:
+          - redhat_zuul_merger_service_config_stat.stat.exists
+          - redhat_zuul_merger_service_config_stat.stat.isreg
+          - redhat_zuul_merger_service_config_stat.stat.pw_name == 'root'
+          - redhat_zuul_merger_service_config_stat.stat.gr_name == 'root'
+          - redhat_zuul_merger_service_config_stat.stat.mode == '0644'
+      when: ansible_os_family == 'RedHat'
+
     - name: Register /etc/systemd/system/zuul-server.service
       stat:
         path: /etc/systemd/system/zuul-server.service
@@ -235,6 +283,22 @@
           - redhat_zuul_server_service_stat.stat.mode == '0644'
       when: ansible_os_family == 'RedHat'
 
+    - name: Register /etc/sysconfig/zuul-server
+      stat:
+        path: /etc/sysconfig/zuul-server
+      register: redhat_zuul_server_service_config_stat
+      when: ansible_os_family == 'RedHat'
+
+    - name: Assert redhat_zuul_server_service_config_stat tests.
+      assert:
+        that:
+          - redhat_zuul_server_service_config_stat.stat.exists
+          - redhat_zuul_server_service_config_stat.stat.isreg
+          - redhat_zuul_server_service_config_stat.stat.pw_name == 'root'
+          - redhat_zuul_server_service_config_stat.stat.gr_name == 'root'
+          - redhat_zuul_server_service_config_stat.stat.mode == '0644'
+      when: ansible_os_family == 'RedHat'
+
     - name: Ensure zuul-launcher is running.
       shell: /usr/sbin/service zuul-launcher status
       tags: skip_ansible_lint

vars/Debian.yaml

@@ -16,18 +16,26 @@ __zuul_build_depends:
   - git
   - python-dev
 
-__zuul_file_zuul_service_config_dest: /etc/default/zuul
-__zuul_file_zuul_service_config_mode: "0644"
-__zuul_file_zuul_service_config_src: etc/default/zuul
-
 __zuul_file_zuul_launcher_service_dest: /etc/init.d/zuul-launcher
 __zuul_file_zuul_launcher_service_mode: "0755"
 __zuul_file_zuul_launcher_service_src: etc/init.d/zuul-launcher
 
+__zuul_file_zuul_launcher_service_config_dest: /etc/default/zuul-launcher
+__zuul_file_zuul_launcher_service_config_mode: "0644"
+__zuul_file_zuul_launcher_service_config_src: etc/default/zuul-launcher
+
 __zuul_file_zuul_merger_service_dest: /etc/init.d/zuul-merger
 __zuul_file_zuul_merger_service_mode: "0755"
 __zuul_file_zuul_merger_service_src: etc/init.d/zuul-merger
 
+__zuul_file_zuul_merger_service_config_dest: /etc/default/zuul-merger
+__zuul_file_zuul_merger_service_config_mode: "0644"
+__zuul_file_zuul_merger_service_config_src: etc/default/zuul-merger
+
 __zuul_file_zuul_server_service_dest: /etc/init.d/zuul-server
 __zuul_file_zuul_server_service_mode: "0755"
 __zuul_file_zuul_server_service_src: etc/init.d/zuul-server
+
+__zuul_file_zuul_server_service_config_dest: /etc/default/zuul-server
+__zuul_file_zuul_server_service_config_mode: "0644"
+__zuul_file_zuul_server_service_config_src: etc/default/zuul-server

vars/RedHat.yaml

@@ -18,18 +18,26 @@ __zuul_build_depends:
   - git
   - python-devel
 
-__zuul_file_zuul_service_config_dest: /etc/sysconfig/zuul
-__zuul_file_zuul_service_config_mode: "0644"
-__zuul_file_zuul_service_config_src: etc/sysconfig/zuul
-
 __zuul_file_zuul_launcher_service_dest: /etc/systemd/system/zuul-launcher.service
 __zuul_file_zuul_launcher_service_mode: "0644"
 __zuul_file_zuul_launcher_service_src: etc/systemd/system/zuul-launcher.service
 
+__zuul_file_zuul_launcher_service_config_dest: /etc/sysconfig/zuul-launcher
+__zuul_file_zuul_launcher_service_config_mode: "0644"
+__zuul_file_zuul_launcher_service_config_src: etc/sysconfig/zuul-launcher
+
 __zuul_file_zuul_merger_service_dest: /etc/systemd/system/zuul-merger.service
 __zuul_file_zuul_merger_service_mode: "0644"
 __zuul_file_zuul_merger_service_src: etc/systemd/system/zuul-merger.service
 
+__zuul_file_zuul_merger_service_config_dest: /etc/sysconfig/zuul-merger
+__zuul_file_zuul_merger_service_config_mode: "0644"
+__zuul_file_zuul_merger_service_config_src: etc/sysconfig/zuul-merger
+
 __zuul_file_zuul_server_service_dest: /etc/systemd/system/zuul-server.service
 __zuul_file_zuul_server_service_mode: "0644"
 __zuul_file_zuul_server_service_src: etc/systemd/system/zuul-server.service
+
+__zuul_file_zuul_server_service_config_dest: /etc/sysconfig/zuul-server
+__zuul_file_zuul_server_service_config_mode: "0644"
+__zuul_file_zuul_server_service_config_src: etc/sysconfig/zuul-server