move systemd unit modifications to start of site.yml

Author: sjpb

ansible/bootstrap.yml

@@ -37,6 +37,15 @@
     - name: Reset ssh connection to allow user changes to affect ansible_user
       meta: reset_connection
 
+- hosts: systemd
+  become: yes
+  gather_facts: false
+  tags: systemd
+  tasks:
+    - name: Make systemd unit modifications
+      import_role:
+        name: systemd
+
 - hosts: selinux
   gather_facts: false
   become: yes

ansible/roles/systemd/README.md

@@ -16,3 +16,4 @@ Create drop-in files for systemd services.
     - `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_restart`: Optional bool. Whether to reload unit definitions and restart services. Default `false`.

ansible/roles/systemd/defaults/main.yml

@@ -0,0 +1,7 @@
+#systemd_dropins:
+#   <unit_name>:
+#     group: <required>
+#     comment: <optional>
+#     content: <required>
+
+systemd_restart: false

ansible/roles/systemd/tasks/main.yml

@@ -25,7 +25,9 @@
 - name: Reload unit definitions
   ansible.builtin.shell:
     cmd: systemctl daemon-reload
-  when: _systemd_dropins.changed
+  when:
+    - _systemd_dropins.changed
+    - systemd_restart | default(false) | bool
 
 - name: Reload units
   ansible.builtin.systemd:
@@ -35,3 +37,4 @@
   when:
     - _systemd_dropins.changed
     - "item.value.group in group_names"
+    - systemd_restart | default(false) | bool

ansible/site.yml

@@ -22,7 +22,6 @@
 - import_playbook: portal.yml
 - import_playbook: monitoring.yml
 - import_playbook: iam.yml
-- import_playbook: systemd.yml
 
 - name: Run post.yml hook
   vars: