windmill/ansible-role-nodepool
Code Issues Proposed changes

Simplify systemd service configuration

Browse Source 
Merge these files into a single override.conf file.

Change-Id: I9a8c0f01041986e7b6f01de2d4d89eccffcf86bf
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-04-04 23:41:06 -04:00
parent 663e9ce11c
commit 0a8f3a160b
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
6 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
templates/etc/systemd/system/nodepool-builder.service.d/redhat.conf → templates/etc/systemd/system/nodepool-builder.service.d/override.conf
View File

0
templates/etc/systemd/system/nodepool-builder.service.d/ubuntu-xenial.conf → templates/etc/systemd/system/nodepool-launcher.service.d/override.conf
View File

3
templates/etc/systemd/system/nodepool-launcher.service.d/redhat.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/nodepool-launcher.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
#

4
vars/redhat.yaml
View File

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

4
vars/ubuntu.yaml
View File

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