make systemd role more generic

Author: sjpb

ansible/roles/systemd/README.md

@@ -0,0 +1,18 @@
+# systemd
+
+Create drop-in files for systemd services.
+
+# Role Variables
+- `systemd_dropins`: Required. A mapping where keys = systemd service name, values are a dict as follows:
+    - `group`: Required str. Inventory group this drop-in applies to.
+    - `comment`: Optional str. Comment describing reason for drop-in.
+    - `content`: Required str. Content of drop-in file.
+# systemd
+
+Create drop-in files for systemd services.
+
+# Role Variables
+- `systemd_dropins`: Required. A mapping where keys = systemd service name, values are a dict as follows:
+    - `group`: Required str. Inventory group this drop-in applies to.
+    - `comment`: Optional str. Comment describing reason for drop-in.
+    - `content`: Required str. Content of drop-in file.

ansible/roles/systemd/tasks/main.yml

@@ -1,33 +1,37 @@
-
-# NB: As `appliances_persistent_services` is defined in group_vars/all, all tasks here are conditional
+# NB: As `systemd_TODO:` is defined in group_vars/all, all tasks here are conditional on group.
 - name: Make directory for unit dropins
   file:
     path: "/etc/systemd/system/{{ item.key }}.service.d/"
     state: directory
-  loop: "{{ appliances_persistent_services | dict2items }}"
-  when: "'item.value' in group_names"
+    owner: root
+    group: root
+    mode: 0644
+  loop: "{{ systemd_dropins | dict2items }}"
+  when: "item.value.group in group_names"
 
 - name: Add dropins for unit files
   ansible.builtin.copy:
     content: |
-      [Unit]
-      RequiresMountsFor={{ appliances_state_dir }}
-    dest: "/etc/systemd/system/{{ item.key }}.service.d/appliance_state.conf"
-  loop: "{{ appliances_persistent_service | dict2items }}"
-  register: _systemd_persistent_services_dropins
-  when: "'item.value' in group_names"
+      # {{ item.value.comment | default('slurm appliance generated') }}
+      {{ item.value.content }}
+    dest: "/etc/systemd/system/{{ item.key }}.service.d/slurm_app.conf"
+    owner: root
+    group: root
+    mode: 0644
+  loop: "{{ systemd_dropins | dict2items }}"
+  register: _systemd_dropins
+  when: "item.value.group in group_names"
 
 - name: Reload unit definitions
   ansible.builtin.shell:
     cmd: systemctl daemon-reload
-  when: _systemd_persistent_services_dropins.changed
+  when: _systemd_dropins.changed
 
 - name: Reload units
   ansible.builtin.systemd:
     name: "{{ item.key }}"
     state: restarted
-  loop: "{{ appliances_persistent_service | dict2items }}"
+  loop: "{{ systemd_dropins | dict2items }}"
   when:
-    - _systemd_persistent_services_dropins.changed
-    - "'item.value' in group_names"
-    # - "'builder' not in group_names" # because mount of appliances_state_dir won't be done in builder
+    - _systemd_dropins.changed
+    - "item.value.group in group_names"

environments/common/inventory/group_vars/all/defaults.yml

@@ -4,13 +4,6 @@ ansible_user: rocky
 appliances_repository_root: "{{ lookup('env', 'APPLIANCES_REPO_ROOT') }}"
 appliances_environment_root: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}"
 #appliances_state_dir: # define an absolute path here to use for persistent state
-appliances_persistent_services: # dict of service:role requiring appliances_state_dir
-  # mysql not included as it role handles state dir correctly
-  opendistro: opendistro
-  grafana-server: grafana
-  slurmdbd: openhpc
-  slurmctld: openhpc
-  prometheus: prometheus
 
 # Address(ip/dns) for internal communication between services. This is
 # normally traffic you do no want to expose to users.

environments/common/inventory/group_vars/all/systemd.yml

@@ -0,0 +1,23 @@
+_systemd_requiresmount_statedir: |
+  [Unit]
+  RequiresMountsFor={{ appliances_state_dir }}
+
+_systemd_dropins_statedir:
+  # mysql not included as role handles state dir correctly
+  opendistro:
+    group: opendistro
+    content: "{{ _systemd_requiresmount_statedir }}"
+  grafana-server:
+    group: grafana
+    content: "{{ _systemd_requiresmount_statedir }}"
+  slurmdbd:
+    group: openhpc
+    content: "{{ _systemd_requiresmount_statedir }}"
+  slurmctld:
+    group: openhpc
+    content: "{{ _systemd_requiresmount_statedir }}"
+  prometheus:
+    group: prometheus
+    content: "{{ _systemd_requiresmount_statedir }}"
+
+systemd_dropins: "{{ _systemd_dropins_statedir if appliances_state_dir is defined else {} }}"