From fedc3c6666bb6aef201c6f8bf67eec79e3e6c3d1 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 25 May 2017 19:50:56 -0400 Subject: [PATCH] Switch to systemd per service config files The recommended way to setup service config files is with using: systemctl edit foo.service This updates our systemd configuration files to support this. Change-Id: I405d6063ad3d5fd529139d7ce17c3238924f2e45 Depends-On: I92801be5fadc91c72e562b4b8dfb2ed1af24a320 Signed-off-by: Paul Belanger --- files/etc/sysconfig/zuul-executor | 7 -- files/etc/sysconfig/zuul-merger | 7 -- files/etc/sysconfig/zuul-scheduler | 7 -- ...ce.ubuntu-xenial => zuul-executor.service} | 4 +- .../system/zuul-executor.service.centos-7 | 13 --- ...vice.ubuntu-xenial => zuul-merger.service} | 5 +- .../system/zuul-merger.service.centos-7 | 14 --- ...e.ubuntu-xenial => zuul-scheduler.service} | 4 +- .../system/zuul-scheduler.service.centos-7 | 14 --- tasks/service.yaml | 33 +++++- .../zuul-executor.service.d/centos-7.conf | 5 + .../ubuntu-xenial.conf | 3 + .../zuul-merger.service.d/centos-7.conf | 5 + .../zuul-merger.service.d/ubuntu-xenial.conf | 3 + .../zuul-scheduler.service.d/centos-7.conf | 5 + .../ubuntu-xenial.conf | 3 + tests/test.yaml | 108 +++++------------- vars/redhat.yaml | 18 +-- vars/ubuntu-xenial.yaml | 18 +-- 19 files changed, 105 insertions(+), 171 deletions(-) delete mode 100644 files/etc/sysconfig/zuul-executor delete mode 100644 files/etc/sysconfig/zuul-merger delete mode 100644 files/etc/sysconfig/zuul-scheduler rename files/etc/systemd/system/{zuul-executor.service.ubuntu-xenial => zuul-executor.service} (82%) delete mode 100644 files/etc/systemd/system/zuul-executor.service.centos-7 rename files/etc/systemd/system/{zuul-merger.service.ubuntu-xenial => zuul-merger.service} (77%) delete mode 100644 files/etc/systemd/system/zuul-merger.service.centos-7 rename files/etc/systemd/system/{zuul-scheduler.service.ubuntu-xenial => zuul-scheduler.service} (84%) delete mode 100644 files/etc/systemd/system/zuul-scheduler.service.centos-7 create mode 100644 templates/etc/systemd/system/zuul-executor.service.d/centos-7.conf create mode 100644 templates/etc/systemd/system/zuul-executor.service.d/ubuntu-xenial.conf create mode 100644 templates/etc/systemd/system/zuul-merger.service.d/centos-7.conf create mode 100644 templates/etc/systemd/system/zuul-merger.service.d/ubuntu-xenial.conf create mode 100644 templates/etc/systemd/system/zuul-scheduler.service.d/centos-7.conf create mode 100644 templates/etc/systemd/system/zuul-scheduler.service.d/ubuntu-xenial.conf diff --git a/files/etc/sysconfig/zuul-executor b/files/etc/sysconfig/zuul-executor deleted file mode 100644 index 9201e4b..0000000 --- a/files/etc/sysconfig/zuul-executor +++ /dev/null @@ -1,7 +0,0 @@ -# This file is generated by Ansible -# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN -# - -# The prefix used when zuul-executor was installed. Be sure to update this value -# if you are using a virtualenv. -PREFIX=/usr diff --git a/files/etc/sysconfig/zuul-merger b/files/etc/sysconfig/zuul-merger deleted file mode 100644 index 6f9b150..0000000 --- a/files/etc/sysconfig/zuul-merger +++ /dev/null @@ -1,7 +0,0 @@ -# This file is generated by Ansible -# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN -# - -# The prefix used when zuul-merger was installed. Be sure to update this value -# if you are using a virtualenv. -PREFIX=/usr diff --git a/files/etc/sysconfig/zuul-scheduler b/files/etc/sysconfig/zuul-scheduler deleted file mode 100644 index d1c582f..0000000 --- a/files/etc/sysconfig/zuul-scheduler +++ /dev/null @@ -1,7 +0,0 @@ -# This file is generated by Ansible -# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN -# - -# The prefix used when zuul-scheduler was installed. Be sure to update this value -# if you are using a virtualenv. -PREFIX=/usr diff --git a/files/etc/systemd/system/zuul-executor.service.ubuntu-xenial b/files/etc/systemd/system/zuul-executor.service similarity index 82% rename from files/etc/systemd/system/zuul-executor.service.ubuntu-xenial rename to files/etc/systemd/system/zuul-executor.service index 26751a4..863aef1 100644 --- a/files/etc/systemd/system/zuul-executor.service.ubuntu-xenial +++ b/files/etc/systemd/system/zuul-executor.service @@ -4,9 +4,9 @@ After=syslog.target network.target [Service] Type=simple -User=zuul +Environment="PREFIX=/usr/local" Group=zuul -EnvironmentFile=-/etc/default/zuul-executor +User=zuul ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-executor -d" [Install] diff --git a/files/etc/systemd/system/zuul-executor.service.centos-7 b/files/etc/systemd/system/zuul-executor.service.centos-7 deleted file mode 100644 index f66e2bc..0000000 --- a/files/etc/systemd/system/zuul-executor.service.centos-7 +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Zuul Executor Service -After=syslog.target network.target - -[Service] -Type=simple -User=zuul -Group=zuul -EnvironmentFile=-/etc/sysconfig/zuul-executor -ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-executor -d" - -[Install] -WantedBy=multi-user.target diff --git a/files/etc/systemd/system/zuul-merger.service.ubuntu-xenial b/files/etc/systemd/system/zuul-merger.service similarity index 77% rename from files/etc/systemd/system/zuul-merger.service.ubuntu-xenial rename to files/etc/systemd/system/zuul-merger.service index b88c464..ea8f8af 100644 --- a/files/etc/systemd/system/zuul-merger.service.ubuntu-xenial +++ b/files/etc/systemd/system/zuul-merger.service @@ -4,10 +4,9 @@ After=syslog.target network.target [Service] Type=simple -User=zuul +Environment="PREFIX=/usr/local" Group=zuul -LimitNOFILE=8192 -EnvironmentFile=-/etc/default/zuul-merger +User=zuul ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-merger -d" [Install] diff --git a/files/etc/systemd/system/zuul-merger.service.centos-7 b/files/etc/systemd/system/zuul-merger.service.centos-7 deleted file mode 100644 index 83c4dcd..0000000 --- a/files/etc/systemd/system/zuul-merger.service.centos-7 +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Zuul Merger Service -After=syslog.target network.target - -[Service] -Type=simple -User=zuul -Group=zuul -LimitNOFILE=8192 -EnvironmentFile=-/etc/sysconfig/zuul-merger -ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-merger -d" - -[Install] -WantedBy=multi-user.target diff --git a/files/etc/systemd/system/zuul-scheduler.service.ubuntu-xenial b/files/etc/systemd/system/zuul-scheduler.service similarity index 84% rename from files/etc/systemd/system/zuul-scheduler.service.ubuntu-xenial rename to files/etc/systemd/system/zuul-scheduler.service index adaf548..2900cfc 100644 --- a/files/etc/systemd/system/zuul-scheduler.service.ubuntu-xenial +++ b/files/etc/systemd/system/zuul-scheduler.service @@ -4,9 +4,9 @@ After=syslog.target network.target [Service] Type=simple -User=zuul +Environment="PREFIX=/usr/local" Group=zuul -EnvironmentFile=-/etc/default/zuul-scheduler +User=zuul ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-scheduler -d" ExecReload=/bin/kill -HUP $MAINPID diff --git a/files/etc/systemd/system/zuul-scheduler.service.centos-7 b/files/etc/systemd/system/zuul-scheduler.service.centos-7 deleted file mode 100644 index 228f4e0..0000000 --- a/files/etc/systemd/system/zuul-scheduler.service.centos-7 +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Zuul Scheduler Service -After=syslog.target network.target - -[Service] -Type=simple -User=zuul -Group=zuul -EnvironmentFile=-/etc/sysconfig/zuul-scheduler -ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-scheduler -d" -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/tasks/service.yaml b/tasks/service.yaml index 26be40f..25917f1 100644 --- a/tasks/service.yaml +++ b/tasks/service.yaml @@ -113,9 +113,18 @@ register: zuul_file_zuul_executor_service when: zuul_file_zuul_executor_service_manage +- name: Create zuul-executor service config directory. + become: yes + file: + group: "{{ zuul_file_zuul_executor_service_config_group }}" + owner: "{{ zuul_file_zuul_executor_service_config_owner }}" + path: "{{ zuul_file_zuul_executor_service_dest }}.d" + state: directory + when: zuul_file_zuul_executor_service_config_manage + - name: Copy zuul-executor service config into place. become: yes - copy: + template: dest: "{{ zuul_file_zuul_executor_service_config_dest }}" group: "{{ zuul_file_zuul_executor_service_config_group }}" mode: "{{ zuul_file_zuul_executor_service_config_mode }}" @@ -135,9 +144,18 @@ register: zuul_file_zuul_merger_service when: zuul_file_zuul_merger_service_manage +- name: Create zuul-merger service config directory. + become: yes + file: + group: "{{ zuul_file_zuul_merger_service_config_group }}" + owner: "{{ zuul_file_zuul_merger_service_config_owner }}" + path: "{{ zuul_file_zuul_merger_service_dest }}.d" + state: directory + when: zuul_file_zuul_merger_service_config_manage + - name: Copy zuul-merger service config into place. become: yes - copy: + template: dest: "{{ zuul_file_zuul_merger_service_config_dest }}" group: "{{ zuul_file_zuul_merger_service_config_group }}" mode: "{{ zuul_file_zuul_merger_service_config_mode }}" @@ -157,9 +175,18 @@ register: zuul_file_zuul_scheduler_service when: zuul_file_zuul_scheduler_service_manage +- name: Create zuul-scheduler service config directory. + become: yes + file: + group: "{{ zuul_file_zuul_scheduler_service_config_group }}" + owner: "{{ zuul_file_zuul_scheduler_service_config_owner }}" + path: "{{ zuul_file_zuul_scheduler_service_dest }}.d" + state: directory + when: zuul_file_zuul_scheduler_service_config_manage + - name: Copy zuul-scheduler service config into place. become: yes - copy: + template: dest: "{{ zuul_file_zuul_scheduler_service_config_dest }}" group: "{{ zuul_file_zuul_scheduler_service_config_group }}" mode: "{{ zuul_file_zuul_scheduler_service_config_mode }}" diff --git a/templates/etc/systemd/system/zuul-executor.service.d/centos-7.conf b/templates/etc/systemd/system/zuul-executor.service.d/centos-7.conf new file mode 100644 index 0000000..ce86bc9 --- /dev/null +++ b/templates/etc/systemd/system/zuul-executor.service.d/centos-7.conf @@ -0,0 +1,5 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# +[Service] +Environment="PREFIX=/usr" diff --git a/templates/etc/systemd/system/zuul-executor.service.d/ubuntu-xenial.conf b/templates/etc/systemd/system/zuul-executor.service.d/ubuntu-xenial.conf new file mode 100644 index 0000000..602ac8e --- /dev/null +++ b/templates/etc/systemd/system/zuul-executor.service.d/ubuntu-xenial.conf @@ -0,0 +1,3 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# diff --git a/templates/etc/systemd/system/zuul-merger.service.d/centos-7.conf b/templates/etc/systemd/system/zuul-merger.service.d/centos-7.conf new file mode 100644 index 0000000..ce86bc9 --- /dev/null +++ b/templates/etc/systemd/system/zuul-merger.service.d/centos-7.conf @@ -0,0 +1,5 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# +[Service] +Environment="PREFIX=/usr" diff --git a/templates/etc/systemd/system/zuul-merger.service.d/ubuntu-xenial.conf b/templates/etc/systemd/system/zuul-merger.service.d/ubuntu-xenial.conf new file mode 100644 index 0000000..602ac8e --- /dev/null +++ b/templates/etc/systemd/system/zuul-merger.service.d/ubuntu-xenial.conf @@ -0,0 +1,3 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# diff --git a/templates/etc/systemd/system/zuul-scheduler.service.d/centos-7.conf b/templates/etc/systemd/system/zuul-scheduler.service.d/centos-7.conf new file mode 100644 index 0000000..ce86bc9 --- /dev/null +++ b/templates/etc/systemd/system/zuul-scheduler.service.d/centos-7.conf @@ -0,0 +1,5 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# +[Service] +Environment="PREFIX=/usr" diff --git a/templates/etc/systemd/system/zuul-scheduler.service.d/ubuntu-xenial.conf b/templates/etc/systemd/system/zuul-scheduler.service.d/ubuntu-xenial.conf new file mode 100644 index 0000000..602ac8e --- /dev/null +++ b/templates/etc/systemd/system/zuul-scheduler.service.d/ubuntu-xenial.conf @@ -0,0 +1,3 @@ +# This file is generated by Ansible +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +# diff --git a/tests/test.yaml b/tests/test.yaml index 8e3edcc..d90bdc2 100644 --- a/tests/test.yaml +++ b/tests/test.yaml @@ -126,53 +126,47 @@ - zuul_conf_stat.stat.pw_name == 'zuul' - zuul_conf_stat.stat.gr_name == 'zuul' - - name: Register /etc/default/zuul-executor + - name: Register /etc/systemd/system/zuul-executor.service.d/override.conf stat: - path: /etc/default/zuul-executor - register: debian_zuul_executor_service_config_stat - when: ansible_os_family == 'Debian' + path: /etc/systemd/system/zuul-executor.service.d/override.conf + register: zuul_executor_service_config_stat - - name: Assert debian_zuul_executor_service_config_stat tests. + - name: Assert zuul_executor_service_config_stat tests. assert: that: - - debian_zuul_executor_service_config_stat.stat.exists - - debian_zuul_executor_service_config_stat.stat.isreg - - debian_zuul_executor_service_config_stat.stat.pw_name == 'root' - - debian_zuul_executor_service_config_stat.stat.gr_name == 'root' - - debian_zuul_executor_service_config_stat.stat.mode == '0644' - when: ansible_os_family == 'Debian' + - zuul_executor_service_config_stat.stat.exists + - zuul_executor_service_config_stat.stat.isreg + - zuul_executor_service_config_stat.stat.pw_name == 'root' + - zuul_executor_service_config_stat.stat.gr_name == 'root' + - zuul_executor_service_config_stat.stat.mode == '0644' - - name: Register /etc/default/zuul-merger + - name: Register /etc/systemd/system/zuul-merger.service.d/override.conf stat: - path: /etc/default/zuul-merger - register: debian_zuul_merger_service_config_stat - when: ansible_os_family == 'Debian' + path: /etc/systemd/system/zuul-merger.service.d/override.conf + register: zuul_merger_service_config_stat - - name: Assert debian_zuul_merger_service_config_stat tests. + - name: Assert 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' + - zuul_merger_service_config_stat.stat.exists + - zuul_merger_service_config_stat.stat.isreg + - zuul_merger_service_config_stat.stat.pw_name == 'root' + - zuul_merger_service_config_stat.stat.gr_name == 'root' + - zuul_merger_service_config_stat.stat.mode == '0644' - - name: Register /etc/default/zuul-scheduler + - name: Register /etc/systemd/system/zuul-scheduler.service.d/override.conf stat: - path: /etc/default/zuul-scheduler - register: debian_zuul_scheduler_service_config_stat - when: ansible_os_family == 'Debian' + path: /etc/systemd/system/zuul-scheduler.service.d/override.conf + register: zuul_scheduler_service_config_stat - - name: Assert debian_zuul_scheduler_service_config_stat tests. + - name: Assert zuul_scheduler_service_config_stat tests. assert: that: - - debian_zuul_scheduler_service_config_stat.stat.exists - - debian_zuul_scheduler_service_config_stat.stat.isreg - - debian_zuul_scheduler_service_config_stat.stat.pw_name == 'root' - - debian_zuul_scheduler_service_config_stat.stat.gr_name == 'root' - - debian_zuul_scheduler_service_config_stat.stat.mode == '0644' - when: ansible_os_family == 'Debian' + - zuul_scheduler_service_config_stat.stat.exists + - zuul_scheduler_service_config_stat.stat.isreg + - zuul_scheduler_service_config_stat.stat.pw_name == 'root' + - zuul_scheduler_service_config_stat.stat.gr_name == 'root' + - zuul_scheduler_service_config_stat.stat.mode == '0644' - name: Register /etc/systemd/system/zuul-executor.service stat: @@ -192,22 +186,6 @@ when: (ansible_os_family == 'RedHat') or (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') - - name: Register /etc/sysconfig/zuul-executor - stat: - path: /etc/sysconfig/zuul-executor - register: redhat_zuul_executor_service_config_stat - when: ansible_os_family == 'RedHat' - - - name: Assert redhat_zuul_executor_service_config_stat tests. - assert: - that: - - redhat_zuul_executor_service_config_stat.stat.exists - - redhat_zuul_executor_service_config_stat.stat.isreg - - redhat_zuul_executor_service_config_stat.stat.pw_name == 'root' - - redhat_zuul_executor_service_config_stat.stat.gr_name == 'root' - - redhat_zuul_executor_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 @@ -226,22 +204,6 @@ when: (ansible_os_family == 'RedHat') or (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') - - 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-scheduler.service stat: path: /etc/systemd/system/zuul-scheduler.service @@ -260,22 +222,6 @@ when: (ansible_os_family == 'RedHat') or (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') - - name: Register /etc/sysconfig/zuul-scheduler - stat: - path: /etc/sysconfig/zuul-scheduler - register: redhat_zuul_scheduler_service_config_stat - when: ansible_os_family == 'RedHat' - - - name: Assert redhat_zuul_scheduler_service_config_stat tests. - assert: - that: - - redhat_zuul_scheduler_service_config_stat.stat.exists - - redhat_zuul_scheduler_service_config_stat.stat.isreg - - redhat_zuul_scheduler_service_config_stat.stat.pw_name == 'root' - - redhat_zuul_scheduler_service_config_stat.stat.gr_name == 'root' - - redhat_zuul_scheduler_service_config_stat.stat.mode == '0644' - when: ansible_os_family == 'RedHat' - - name: Ensure zuul-executor is running. become: yes shell: /usr/sbin/service zuul-executor status diff --git a/vars/redhat.yaml b/vars/redhat.yaml index 8421b1b..ca97259 100644 --- a/vars/redhat.yaml +++ b/vars/redhat.yaml @@ -22,24 +22,24 @@ __zuul_build_depends: __zuul_file_zuul_executor_service_dest: /etc/systemd/system/zuul-executor.service __zuul_file_zuul_executor_service_mode: 0644 -__zuul_file_zuul_executor_service_src: etc/systemd/system/zuul-executor.service.centos-7 +__zuul_file_zuul_executor_service_src: etc/systemd/system/zuul-executor.service -__zuul_file_zuul_executor_service_config_dest: /etc/sysconfig/zuul-executor +__zuul_file_zuul_executor_service_config_dest: /etc/systemd/system/zuul-executor.service.d/override.conf __zuul_file_zuul_executor_service_config_mode: 0644 -__zuul_file_zuul_executor_service_config_src: etc/sysconfig/zuul-executor +__zuul_file_zuul_executor_service_config_src: etc/systemd/system/zuul-executor.service.d/centos-7.conf __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.centos-7 +__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_dest: /etc/systemd/system/zuul-merger.service.d/override.conf __zuul_file_zuul_merger_service_config_mode: 0644 -__zuul_file_zuul_merger_service_config_src: etc/sysconfig/zuul-merger +__zuul_file_zuul_merger_service_config_src: etc/systemd/system/zuul-merger.service.d/centos-7.conf __zuul_file_zuul_scheduler_service_dest: /etc/systemd/system/zuul-scheduler.service __zuul_file_zuul_scheduler_service_mode: 0644 -__zuul_file_zuul_scheduler_service_src: etc/systemd/system/zuul-scheduler.service.centos-7 +__zuul_file_zuul_scheduler_service_src: etc/systemd/system/zuul-scheduler.service -__zuul_file_zuul_scheduler_service_config_dest: /etc/sysconfig/zuul-scheduler +__zuul_file_zuul_scheduler_service_config_dest: /etc/systemd/system/zuul-scheduler.service.d/override.conf __zuul_file_zuul_scheduler_service_config_mode: 0644 -__zuul_file_zuul_scheduler_service_config_src: etc/sysconfig/zuul-scheduler +__zuul_file_zuul_scheduler_service_config_src: etc/systemd/system/zuul-scheduler.service.d/centos-7.conf diff --git a/vars/ubuntu-xenial.yaml b/vars/ubuntu-xenial.yaml index 0071ec9..0bfac2e 100644 --- a/vars/ubuntu-xenial.yaml +++ b/vars/ubuntu-xenial.yaml @@ -21,24 +21,24 @@ __zuul_build_depends: __zuul_file_zuul_executor_service_dest: /etc/systemd/system/zuul-executor.service __zuul_file_zuul_executor_service_mode: 0644 -__zuul_file_zuul_executor_service_src: etc/systemd/system/zuul-executor.service.ubuntu-xenial +__zuul_file_zuul_executor_service_src: etc/systemd/system/zuul-executor.service -__zuul_file_zuul_executor_service_config_dest: /etc/default/zuul-executor +__zuul_file_zuul_executor_service_config_dest: /etc/systemd/system/zuul-executor.service.d/override.conf __zuul_file_zuul_executor_service_config_mode: 0644 -__zuul_file_zuul_executor_service_config_src: etc/default/zuul-executor +__zuul_file_zuul_executor_service_config_src: etc/systemd/system/zuul-executor.service.d/ubuntu-xenial.conf __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.ubuntu-xenial +__zuul_file_zuul_merger_service_src: etc/systemd/system/zuul-merger.service -__zuul_file_zuul_merger_service_config_dest: /etc/default/zuul-merger +__zuul_file_zuul_merger_service_config_dest: /etc/systemd/system/zuul-merger.service.d/override.conf __zuul_file_zuul_merger_service_config_mode: 0644 -__zuul_file_zuul_merger_service_config_src: etc/default/zuul-merger +__zuul_file_zuul_merger_service_config_src: etc/systemd/system/zuul-merger.service.d/ubuntu-xenial.conf __zuul_file_zuul_scheduler_service_dest: /etc/systemd/system/zuul-scheduler.service __zuul_file_zuul_scheduler_service_mode: 0644 -__zuul_file_zuul_scheduler_service_src: etc/systemd/system/zuul-scheduler.service.ubuntu-xenial +__zuul_file_zuul_scheduler_service_src: etc/systemd/system/zuul-scheduler.service -__zuul_file_zuul_scheduler_service_config_dest: /etc/default/zuul-scheduler +__zuul_file_zuul_scheduler_service_config_dest: /etc/systemd/system/zuul-scheduler.service.d/override.conf __zuul_file_zuul_scheduler_service_config_mode: 0644 -__zuul_file_zuul_scheduler_service_config_src: etc/default/zuul-scheduler +__zuul_file_zuul_scheduler_service_config_src: etc/systemd/system/zuul-scheduler.service.d/ubuntu-xenial.conf