reconfigure systemd if splunk was upgraded (splunk#151)

Author: jewnix

roles/splunk/tasks/configure_splunk_boot.yml

@@ -3,7 +3,7 @@
 - name: Block for checking boot-start when an existing Splunk installation has been found
   when:
     - splunkd_found.stat.exists
-    - configure_boot_start is defined
+    - configure_boot_start is defined or splunk_upgraded is defined
   block:
     - name: Check if Splunk needs to be stopped if boot-start isn't configured as Ansible expects (or boot-start is not configured at all)
       include_tasks: check_splunk_status.yml
@@ -25,10 +25,10 @@
       become: true
       ignore_errors: yes
 
-    - name: Disable boot-start if current configuration does not matched expected configuration
+    - name: Disable boot-start if it needs to be to reconfigured
       command: "{{ splunk_home }}/bin/splunk disable boot-start"
       become: true
-      when: current_start_method is defined
+      when: current_start_method is defined or splunk_upgraded is defined
 
     - name: Ensure init.d file is really gone
       file:
@@ -40,28 +40,28 @@
         - reload systemctl daemon
 
 - name: Enable splunk boot-start via initd
-  command: "{{ splunk_home }}/bin/splunk enable boot-start -user {{ splunk_nix_user }} -group {{ splunk_nix_group }} -systemd-managed 0 --answer-yes --auto-ports --no-prompt --accept-license"
-  become: true
-  when:
-    - desired_start_method == "initd"
-    - configure_boot_start is defined
-  notify:
-    - set ulimits in init.d
-    - reload systemctl daemon
-    - start splunk
+  when: configure_boot_start is defined or splunk_upgraded is defined
+  block:
+  - name: Enable splunk boot-start via initd
+    command: "{{ splunk_home }}/bin/splunk enable boot-start -user {{ splunk_nix_user }} -group {{ splunk_nix_group }} -systemd-managed 0 --answer-yes --auto-ports --no-prompt --accept-license"
+    become: true
+    when:
+      - desired_start_method == "initd"
+    notify:
+      - set ulimits in init.d
+      - reload systemctl daemon
+      - start splunk
 
-- name: Enable splunk boot-start via systemd
-  command: "{{ splunk_home }}/bin/splunk enable boot-start -user {{ splunk_nix_user }} -group {{ splunk_nix_group }} -systemd-managed 1 -systemd-unit-file-name {{ systemd_unit }} -create-polkit-rules {{ splunk_create_polkit }} --answer-yes --auto-ports --no-prompt --accept-license"
-  become: true
-  when:
-    - desired_start_method == "systemd"
-    - configure_boot_start is defined
-  notify:
-    - reload systemctl daemon
-    - start splunk
+  - name: Enable splunk boot-start via systemd
+    command: "{{ splunk_home }}/bin/splunk enable boot-start -user {{ splunk_nix_user }} -group {{ splunk_nix_group }} -systemd-managed 1 -systemd-unit-file-name {{ systemd_unit }} -create-polkit-rules {{ splunk_create_polkit }} --answer-yes --auto-ports --no-prompt --accept-license"
+    become: true
+    when:
+      - desired_start_method == "systemd"
+    notify:
+      - reload systemctl daemon
+      - start splunk
 
-- name: Update systemd file
-  include_tasks: configure_systemd.yml
-  when:
-    - desired_start_method == "systemd"
-    - configure_boot_start is defined
+  - name: Update systemd file
+    include_tasks: configure_systemd.yml
+    when:
+      - desired_start_method == "systemd"

roles/splunk/tasks/upgrade_splunk.yml

@@ -23,6 +23,10 @@
 - name: Include accept license task
   include_tasks: splunk_license_accept.yml
 
+- name: set splunk_uprgaded variable
+  set_fact:
+    splunk_upgraded: True
+
 - name: Enable boot start
   include_tasks: configure_splunk_boot.yml