Added updated configure_splunk_boot.yml

Author: Mason Morales

roles/splunk/tasks/configure_splunk_boot.yml

@@ -1,69 +1,73 @@
 ---
 # Note: Splunk must be stopped when creating or altering systemd related configurations for it
-- 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)
-  command: "{{ splunk_home }}/bin/splunk status"
-  register: splunk_status
-  become: yes
-  become_user: "{{ splunk_nix_user }}"
-  changed_when: false
-  failed_when: false
-  when: >
-    (systemd_boot.stat.exists and splunk_use_initd) or
-    (initd_boot.stat.exists and not splunk_use_initd) or
-    (not systemd_boot.stat.exists and not initd_boot.stat.exists and not splunk_use_initd)
-
-- name: Block to stop splunk when systemd was detected but init.d is configured in Ansible
+- name: Block for checking boot-start when an existing Splunk installation has been found
   block:
-    - name: Stop Splunkd via systemd service name to prepare for conversion to init.d
-      service:
-        name: Splunkd
-        state: stopped
-      become: yes
-      when:
-        - "'full' in group_names"
+    
+  - 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)
+    command: "{{ splunk_home }}/bin/splunk status"
+    register: splunk_status
+    become: yes
+    become_user: "{{ splunk_nix_user }}"
+    changed_when: false
+    failed_when: false
+    when: >
+      ((systemd_boot and splunk_use_initd) or
+      (initd_boot.stat.exists and not splunk_use_initd) or
+      (not systemd_boot and not initd_boot.stat.exists and not splunk_use_initd))
 
-    - name: Stop SplunkForwarder via systemd service name to prepare for conversion to init.d
-      service:
-        name: SplunkForwarder
-        state: stopped
-      become: yes
-      when:
-        - "'uf' in group_names"
-  when:
-    - systemd_boot.stat.exists and splunk_use_initd
-    - splunk_status.stdout != 'splunkd is not running.'
+  - name: Block to stop splunk when systemd was detected but init.d is configured in Ansible
+    block:
+      - name: Stop Splunkd via systemd service name to prepare for conversion to init.d
+        service:
+          name: Splunkd
+          state: stopped
+        become: yes
+        when:
+          - "'full' in group_names"
 
-- name: Stop Splunk via init.d to prepare for conversion to systemd
-  service:
-    name: splunk
-    state: stopped
-  become: yes
-  when:
-    - initd_boot.stat.exists and not splunk_use_initd
-    - splunk_status.stdout != 'splunkd is not running.'
+      - name: Stop SplunkForwarder via systemd service name to prepare for conversion to init.d
+        service:
+          name: SplunkForwarder
+          state: stopped
+        become: yes
+        when:
+          - "'uf' in group_names"
+    when:
+      - systemd_boot and splunk_use_initd
+      - splunk_status.stdout != 'splunkd is not running.'
 
-- name: Stop Splunk via command if boot-start is not configured at all and systemd is configured in Ansible
-  command: "{{ splunk_home }}/bin/splunk stop"
-  become: yes
-  when:
-    - not systemd_boot.stat.exists
-    - not initd_boot.stat.exists
-    - not splunk_use_initd
-    - splunk_status.stdout != 'splunkd is not running.'
+  - name: Stop Splunk via init.d to prepare for conversion to systemd
+    service:
+      name: splunk
+      state: stopped
+    become: yes
+    when:
+      - initd_boot.stat.exists and not splunk_use_initd
+      - splunk_status.stdout != 'splunkd is not running.'
 
-- name: Disable boot-start if current configuration does not matched expected configuration
-  shell: "{{ splunk_home }}/bin/splunk disable boot-start"
-  become: yes
-  when: >
-    (systemd_boot.stat.exists and splunk_use_initd) or
-    (initd_boot.stat.exists and not splunk_use_initd)
+  - name: Stop Splunk via command if boot-start is not configured at all and systemd is configured in Ansible
+    command: "{{ splunk_home }}/bin/splunk stop"
+    become: yes
+    when:
+      - not systemd_boot
+      - not initd_boot.stat.exists
+      - not splunk_use_initd
+      - splunk_status.stdout != 'splunkd is not running.'
+
+  - name: Disable boot-start if current configuration does not matched expected configuration
+    shell: "{{ splunk_home }}/bin/splunk disable boot-start"
+    become: yes
+    when: >
+      (systemd_boot and splunk_use_initd) or
+      (initd_boot.stat.exists and not splunk_use_initd)
+      
+  when: splunkd_found.stat.exists
 
 - name: Enable splunk boot-start via initd
   shell: "{{ splunk_home }}/bin/splunk enable boot-start -user {{ splunk_nix_user }} -systemd-managed 0 --answer-yes --auto-ports --no-prompt --accept-license"
   become: yes
-  when: 
-    - splunk_use_initd
-    - systemd_boot.stat.exists or not initd_boot.stat.exists
+  when:
+    - splunk_use_initd and not initd_boot.stat.exists 
   notify:
     - set ulimits in init.d
     - reload systemctl daemon
@@ -72,9 +76,8 @@
 - name: Enable splunk boot-start via systemd
   shell: "{{ splunk_home }}/bin/splunk enable boot-start -user {{ splunk_nix_user }} -systemd-managed 1 --answer-yes --auto-ports --no-prompt --accept-license"
   become: yes
-  when: 
-    - not splunk_use_initd
-    - initd_boot.stat.exists or not systemd_boot.stat.exists
+  when:
+    - not splunk_use_initd and not systemd_boot
   notify:
     - reload systemctl daemon
     - start splunk