Convert 'systemd' handler into a normal task

tallandtree · May 19, 2016 · 490cc9e · 490cc9e
1 parent 217b75d
commit 490cc9e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,9 @@ v0.1.1
 
 - Make sure that role works in Ansible check mode. [drybjed]
 
+- Change the ``systemd`` handler into a task, so that the ``systemd``
+  configuration is reloaded as soon as possible. [drybjed]
+
 v0.1.0
 ------
 

diff --git a/handlers/main.yml b/handlers/main.yml
@@ -1,10 +1,5 @@
 ---
 
-- name: Reload systemd daemon and enable snmpd.service
-  shell: systemctl daemon-reload ; systemctl enable snmpd.service
-  when: (ansible_local|d() and ansible_local.init|d() and
-          ansible_local.init == "systemd")
-
 - name: Restart snmpd
   service:
     name: 'snmpd'

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -36,7 +36,12 @@
     owner: 'root'
     group: 'root'
     mode: '0644'
-  notify: [ 'Reload systemd daemon', 'Restart snmpd' ]
+  notify: [ 'Restart snmpd' ]
+
+- name: Reload systemd daemon and enable snmpd.service
+  shell: systemctl daemon-reload ; systemctl enable snmpd.service
+  when: ((ansible_local|d() and ansible_local.init|d() and
+          ansible_local.init == "systemd") and not ansible_local.snmpd|d())
 
 - name: Allow 'snmp' user access to /proc if needed
   user:
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,9 @@ v0.1.1 @@
     - Make sure that role works in Ansible check mode. [drybjed]
+    - Change the ``systemd`` handler into a task, so that the ``systemd``
+      configuration is reloaded as soon as possible. [drybjed]
     v0.1.0
     ------
@@ Expand Down @@