windmill
/
ansible-role-zuul
Code Issues Proposed changes

Simplify systemd service configuration 

Merge these files into a single override.conf file.

Change-Id: I2ebfc8b5d0f85fc635a87adc2e2d607239287a92
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-04-05 00:15:29 -04:00
parent 7e2a53bdcd
commit d701975a50
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
12 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
templates/etc/systemd/system/zuul-executor.service.d/centos-7.conf → templates/etc/systemd/system/zuul-executor.service.d/override.conf
View File

0
templates/etc/systemd/system/zuul-executor.service.d/ubuntu-xenial.conf → templates/etc/systemd/system/zuul-fingergw.service.d/override.conf
View File

0
templates/etc/systemd/system/zuul-fingergw.service.d/centos-7.conf → templates/etc/systemd/system/zuul-merger.service.d/override.conf
View File

3
templates/etc/systemd/system/zuul-merger.service.d/ubuntu-xenial.conf
View File

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

3
templates/etc/systemd/system/zuul-scheduler.service.d/centos-7.conf
View File

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

0
templates/etc/systemd/system/zuul-fingergw.service.d/ubuntu-xenial.conf → templates/etc/systemd/system/zuul-scheduler.service.d/override.conf
View File

3
templates/etc/systemd/system/zuul-scheduler.service.d/ubuntu-xenial.conf
View File

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

3
templates/etc/systemd/system/zuul-web.service.d/centos-7.conf
View File

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

0
templates/etc/systemd/system/zuul-merger.service.d/centos-7.conf → templates/etc/systemd/system/zuul-web.service.d/override.conf
View File

3
templates/etc/systemd/system/zuul-web.service.d/ubuntu-xenial.conf
View File

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

10
vars/redhat.yaml
View File

@ -25,7 +25,7 @@ __zuul_file_zuul_executor_service_src: etc/systemd/system/zuul-executor.service
__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/systemd/system/zuul-executor.service.d/centos-7.conf
__zuul_file_zuul_executor_service_config_src: etc/systemd/system/zuul-executor.service.d/override.conf
__zuul_file_zuul_fingergw_service_dest: /etc/systemd/system/zuul-fingergw.service
__zuul_file_zuul_fingergw_service_mode: 0644
@ -33,7 +33,7 @@ __zuul_file_zuul_fingergw_service_src: etc/systemd/system/zuul-fingergw.service
__zuul_file_zuul_fingergw_service_config_dest: /etc/systemd/system/zuul-fingergw.service.d/override.conf
__zuul_file_zuul_fingergw_service_config_mode: 0644
__zuul_file_zuul_fingergw_service_config_src: etc/systemd/system/zuul-fingergw.service.d/centos-7.conf
__zuul_file_zuul_fingergw_service_config_src: etc/systemd/system/zuul-fingergw.service.d/override.conf
__zuul_file_zuul_merger_service_dest: /etc/systemd/system/zuul-merger.service
__zuul_file_zuul_merger_service_mode: 0644
@ -41,7 +41,7 @@ __zuul_file_zuul_merger_service_src: etc/systemd/system/zuul-merger.service
__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/systemd/system/zuul-merger.service.d/centos-7.conf
__zuul_file_zuul_merger_service_config_src: etc/systemd/system/zuul-merger.service.d/override.conf
__zuul_file_zuul_scheduler_service_dest: /etc/systemd/system/zuul-scheduler.service
__zuul_file_zuul_scheduler_service_mode: 0644
@ -49,7 +49,7 @@ __zuul_file_zuul_scheduler_service_src: etc/systemd/system/zuul-scheduler.servic
__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/systemd/system/zuul-scheduler.service.d/centos-7.conf
__zuul_file_zuul_scheduler_service_config_src: etc/systemd/system/zuul-scheduler.service.d/override.conf
__zuul_file_zuul_web_service_dest: /etc/systemd/system/zuul-web.service
__zuul_file_zuul_web_service_mode: 0644
@ -57,4 +57,4 @@ __zuul_file_zuul_web_service_src: etc/systemd/system/zuul-web.service
__zuul_file_zuul_web_service_config_dest: /etc/systemd/system/zuul-web.service.d/override.conf
__zuul_file_zuul_web_service_config_mode: 0644
__zuul_file_zuul_web_service_config_src: etc/systemd/system/zuul-web.service.d/centos-7.conf
__zuul_file_zuul_web_service_config_src: etc/systemd/system/zuul-web.service.d/override.conf

10
vars/ubuntu.yaml
View File

@ -24,7 +24,7 @@ __zuul_file_zuul_executor_service_src: etc/systemd/system/zuul-executor.service
__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/systemd/system/zuul-executor.service.d/ubuntu-xenial.conf
__zuul_file_zuul_executor_service_config_src: etc/systemd/system/zuul-executor.service.d/override.conf
__zuul_file_zuul_fingergw_service_dest: /etc/systemd/system/zuul-fingergw.service
__zuul_file_zuul_fingergw_service_mode: 0644
@ -32,7 +32,7 @@ __zuul_file_zuul_fingergw_service_src: etc/systemd/system/zuul-fingergw.service
__zuul_file_zuul_fingergw_service_config_dest: /etc/systemd/system/zuul-fingergw.service.d/override.conf
__zuul_file_zuul_fingergw_service_config_mode: 0644
__zuul_file_zuul_fingergw_service_config_src: etc/systemd/system/zuul-fingergw.service.d/ubuntu-xenial.conf
__zuul_file_zuul_fingergw_service_config_src: etc/systemd/system/zuul-fingergw.service.d/override.conf
__zuul_file_zuul_merger_service_dest: /etc/systemd/system/zuul-merger.service
__zuul_file_zuul_merger_service_mode: 0644
@ -40,7 +40,7 @@ __zuul_file_zuul_merger_service_src: etc/systemd/system/zuul-merger.service
__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/systemd/system/zuul-merger.service.d/ubuntu-xenial.conf
__zuul_file_zuul_merger_service_config_src: etc/systemd/system/zuul-merger.service.d/override.conf
__zuul_file_zuul_scheduler_service_dest: /etc/systemd/system/zuul-scheduler.service
__zuul_file_zuul_scheduler_service_mode: 0644
@ -48,7 +48,7 @@ __zuul_file_zuul_scheduler_service_src: etc/systemd/system/zuul-scheduler.servic
__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/systemd/system/zuul-scheduler.service.d/ubuntu-xenial.conf
__zuul_file_zuul_scheduler_service_config_src: etc/systemd/system/zuul-scheduler.service.d/override.conf
__zuul_file_zuul_web_service_dest: /etc/systemd/system/zuul-web.service
__zuul_file_zuul_web_service_mode: 0644
@ -56,4 +56,4 @@ __zuul_file_zuul_web_service_src: etc/systemd/system/zuul-web.service
__zuul_file_zuul_web_service_config_dest: /etc/systemd/system/zuul-web.service.d/override.conf
__zuul_file_zuul_web_service_config_mode: 0644
__zuul_file_zuul_web_service_config_src: etc/systemd/system/zuul-web.service.d/ubuntu-xenial.conf
__zuul_file_zuul_web_service_config_src: etc/systemd/system/zuul-web.service.d/override.conf