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 <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-05-25 19:50:56 -04:00
parent fbe33c05bd
commit fedc3c6666
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
19 changed files with 105 additions and 171 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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]

View File

@ -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

View File

@ -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]

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 }}"

View File

@ -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"

View File

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

View File

@ -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"

View File

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

View File

@ -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"

View File

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

View File

@ -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

View File

@ -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

View File

@ -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