From 0a8f3a160b405b883bf3c5c19f416c3fa2e27334 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 4 Apr 2018 23:41:06 -0400 Subject: [PATCH] Simplify systemd service configuration Merge these files into a single override.conf file. Change-Id: I9a8c0f01041986e7b6f01de2d4d89eccffcf86bf Signed-off-by: Paul Belanger --- .../nodepool-builder.service.d/{redhat.conf => override.conf} | 0 .../override.conf} | 0 .../systemd/system/nodepool-launcher.service.d/redhat.conf | 3 --- .../system/nodepool-launcher.service.d/ubuntu-xenial.conf | 3 --- vars/redhat.yaml | 4 ++-- vars/ubuntu.yaml | 4 ++-- 6 files changed, 4 insertions(+), 10 deletions(-) rename templates/etc/systemd/system/nodepool-builder.service.d/{redhat.conf => override.conf} (100%) rename templates/etc/systemd/system/{nodepool-builder.service.d/ubuntu-xenial.conf => nodepool-launcher.service.d/override.conf} (100%) delete mode 100644 templates/etc/systemd/system/nodepool-launcher.service.d/redhat.conf delete mode 100644 templates/etc/systemd/system/nodepool-launcher.service.d/ubuntu-xenial.conf diff --git a/templates/etc/systemd/system/nodepool-builder.service.d/redhat.conf b/templates/etc/systemd/system/nodepool-builder.service.d/override.conf similarity index 100% rename from templates/etc/systemd/system/nodepool-builder.service.d/redhat.conf rename to templates/etc/systemd/system/nodepool-builder.service.d/override.conf diff --git a/templates/etc/systemd/system/nodepool-builder.service.d/ubuntu-xenial.conf b/templates/etc/systemd/system/nodepool-launcher.service.d/override.conf similarity index 100% rename from templates/etc/systemd/system/nodepool-builder.service.d/ubuntu-xenial.conf rename to templates/etc/systemd/system/nodepool-launcher.service.d/override.conf diff --git a/templates/etc/systemd/system/nodepool-launcher.service.d/redhat.conf b/templates/etc/systemd/system/nodepool-launcher.service.d/redhat.conf deleted file mode 100644 index 602ac8e..0000000 --- a/templates/etc/systemd/system/nodepool-launcher.service.d/redhat.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/nodepool-launcher.service.d/ubuntu-xenial.conf b/templates/etc/systemd/system/nodepool-launcher.service.d/ubuntu-xenial.conf deleted file mode 100644 index 602ac8e..0000000 --- a/templates/etc/systemd/system/nodepool-launcher.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 dfca23a..c8d84ad 100644 --- a/vars/redhat.yaml +++ b/vars/redhat.yaml @@ -28,7 +28,7 @@ __nodepool_file_nodepool_builder_service_src: etc/systemd/system/nodepool-builde __nodepool_file_nodepool_builder_service_config_dest: /etc/systemd/system/nodepool-builder.service.d/override.conf __nodepool_file_nodepool_builder_service_config_mode: 0644 -__nodepool_file_nodepool_builder_service_config_src: etc/systemd/system/nodepool-builder.service.d/redhat.conf +__nodepool_file_nodepool_builder_service_config_src: etc/systemd/system/nodepool-builder.service.d/override.conf __nodepool_file_nodepool_launcher_service_dest: /etc/systemd/system/nodepool-launcher.service __nodepool_file_nodepool_launcher_service_mode: 0644 @@ -36,4 +36,4 @@ __nodepool_file_nodepool_launcher_service_src: etc/systemd/system/nodepool-launc __nodepool_file_nodepool_launcher_service_config_dest: /etc/systemd/system/nodepool-launcher.service.d/override.conf __nodepool_file_nodepool_launcher_service_config_mode: 0644 -__nodepool_file_nodepool_launcher_service_config_src: etc/systemd/system/nodepool-launcher.service.d/redhat.conf +__nodepool_file_nodepool_launcher_service_config_src: etc/systemd/system/nodepool-launcher.service.d/override.conf diff --git a/vars/ubuntu.yaml b/vars/ubuntu.yaml index 0369177..318d359 100644 --- a/vars/ubuntu.yaml +++ b/vars/ubuntu.yaml @@ -39,7 +39,7 @@ __nodepool_file_nodepool_builder_service_src: etc/systemd/system/nodepool-builde __nodepool_file_nodepool_builder_service_config_dest: /etc/systemd/system/nodepool-builder.service.d/override.conf __nodepool_file_nodepool_builder_service_config_mode: 0644 -__nodepool_file_nodepool_builder_service_config_src: etc/systemd/system/nodepool-builder.service.d/ubuntu-xenial.conf +__nodepool_file_nodepool_builder_service_config_src: etc/systemd/system/nodepool-builder.service.d/override.conf __nodepool_file_nodepool_launcher_service_dest: /etc/systemd/system/nodepool-launcher.service __nodepool_file_nodepool_launcher_service_mode: 0644 @@ -47,4 +47,4 @@ __nodepool_file_nodepool_launcher_service_src: etc/systemd/system/nodepool-launc __nodepool_file_nodepool_launcher_service_config_dest: /etc/systemd/system/nodepool-launcher.service.d/override.conf __nodepool_file_nodepool_launcher_service_config_mode: 0644 -__nodepool_file_nodepool_launcher_service_config_src: etc/systemd/system/nodepool-launcher.service.d/ubuntu-xenial.conf +__nodepool_file_nodepool_launcher_service_config_src: etc/systemd/system/nodepool-launcher.service.d/override.conf