From d701975a50bcea48902c7580b562c9d0635887b4 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 5 Apr 2018 00:15:29 -0400 Subject: [PATCH] Simplify systemd service configuration Merge these files into a single override.conf file. Change-Id: I2ebfc8b5d0f85fc635a87adc2e2d607239287a92 Signed-off-by: Paul Belanger --- .../{centos-7.conf => override.conf} | 0 .../override.conf} | 0 .../override.conf} | 0 .../system/zuul-merger.service.d/ubuntu-xenial.conf | 3 --- .../system/zuul-scheduler.service.d/centos-7.conf | 3 --- .../override.conf} | 0 .../system/zuul-scheduler.service.d/ubuntu-xenial.conf | 3 --- .../systemd/system/zuul-web.service.d/centos-7.conf | 3 --- .../centos-7.conf => zuul-web.service.d/override.conf} | 0 .../system/zuul-web.service.d/ubuntu-xenial.conf | 3 --- vars/redhat.yaml | 10 +++++----- vars/ubuntu.yaml | 10 +++++----- 12 files changed, 10 insertions(+), 25 deletions(-) rename templates/etc/systemd/system/zuul-executor.service.d/{centos-7.conf => override.conf} (100%) rename templates/etc/systemd/system/{zuul-executor.service.d/ubuntu-xenial.conf => zuul-fingergw.service.d/override.conf} (100%) rename templates/etc/systemd/system/{zuul-fingergw.service.d/centos-7.conf => zuul-merger.service.d/override.conf} (100%) delete mode 100644 templates/etc/systemd/system/zuul-merger.service.d/ubuntu-xenial.conf delete mode 100644 templates/etc/systemd/system/zuul-scheduler.service.d/centos-7.conf rename templates/etc/systemd/system/{zuul-fingergw.service.d/ubuntu-xenial.conf => zuul-scheduler.service.d/override.conf} (100%) delete mode 100644 templates/etc/systemd/system/zuul-scheduler.service.d/ubuntu-xenial.conf delete mode 100644 templates/etc/systemd/system/zuul-web.service.d/centos-7.conf rename templates/etc/systemd/system/{zuul-merger.service.d/centos-7.conf => zuul-web.service.d/override.conf} (100%) delete mode 100644 templates/etc/systemd/system/zuul-web.service.d/ubuntu-xenial.conf diff --git a/templates/etc/systemd/system/zuul-executor.service.d/centos-7.conf b/templates/etc/systemd/system/zuul-executor.service.d/override.conf similarity index 100% rename from templates/etc/systemd/system/zuul-executor.service.d/centos-7.conf rename to templates/etc/systemd/system/zuul-executor.service.d/override.conf diff --git a/templates/etc/systemd/system/zuul-executor.service.d/ubuntu-xenial.conf b/templates/etc/systemd/system/zuul-fingergw.service.d/override.conf similarity index 100% rename from templates/etc/systemd/system/zuul-executor.service.d/ubuntu-xenial.conf rename to templates/etc/systemd/system/zuul-fingergw.service.d/override.conf diff --git a/templates/etc/systemd/system/zuul-fingergw.service.d/centos-7.conf b/templates/etc/systemd/system/zuul-merger.service.d/override.conf similarity index 100% rename from templates/etc/systemd/system/zuul-fingergw.service.d/centos-7.conf rename to templates/etc/systemd/system/zuul-merger.service.d/override.conf 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 deleted file mode 100644 index 602ac8e..0000000 --- a/templates/etc/systemd/system/zuul-merger.service.d/ubuntu-xenial.conf +++ /dev/null @@ -1,3 +0,0 @@ -# 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 deleted file mode 100644 index 602ac8e..0000000 --- a/templates/etc/systemd/system/zuul-scheduler.service.d/centos-7.conf +++ /dev/null @@ -1,3 +0,0 @@ -# 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-fingergw.service.d/ubuntu-xenial.conf b/templates/etc/systemd/system/zuul-scheduler.service.d/override.conf similarity index 100% rename from templates/etc/systemd/system/zuul-fingergw.service.d/ubuntu-xenial.conf rename to templates/etc/systemd/system/zuul-scheduler.service.d/override.conf 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 deleted file mode 100644 index 602ac8e..0000000 --- a/templates/etc/systemd/system/zuul-scheduler.service.d/ubuntu-xenial.conf +++ /dev/null @@ -1,3 +0,0 @@ -# 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-web.service.d/centos-7.conf b/templates/etc/systemd/system/zuul-web.service.d/centos-7.conf deleted file mode 100644 index 602ac8e..0000000 --- a/templates/etc/systemd/system/zuul-web.service.d/centos-7.conf +++ /dev/null @@ -1,3 +0,0 @@ -# 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-web.service.d/override.conf similarity index 100% rename from templates/etc/systemd/system/zuul-merger.service.d/centos-7.conf rename to templates/etc/systemd/system/zuul-web.service.d/override.conf diff --git a/templates/etc/systemd/system/zuul-web.service.d/ubuntu-xenial.conf b/templates/etc/systemd/system/zuul-web.service.d/ubuntu-xenial.conf deleted file mode 100644 index 602ac8e..0000000 --- a/templates/etc/systemd/system/zuul-web.service.d/ubuntu-xenial.conf +++ /dev/null @@ -1,3 +0,0 @@ -# This file is generated by Ansible -# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN -# diff --git a/vars/redhat.yaml b/vars/redhat.yaml index 36275f6..495e32d 100644 --- a/vars/redhat.yaml +++ b/vars/redhat.yaml @@ -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 diff --git a/vars/ubuntu.yaml b/vars/ubuntu.yaml index 6a5505a..85c337c 100644 --- a/vars/ubuntu.yaml +++ b/vars/ubuntu.yaml @@ -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