Merge pull request #16 from splunk/fix_splunk_use_initd

[SAS-5445] Fix issue #15 and minor cleanup in install_apps.yml

Author: Mason Morales

roles/splunk/handlers/main.yml

@@ -13,7 +13,7 @@
     - ulimit -Sn 32768
   become: yes
   ignore_errors: true
-  when: splunk_use_initd == "true" and ansible_os_family == "RedHat" and ansible_distribution_major_version|int > 6
+  when: splunk_use_initd and ansible_os_family == "RedHat" and ansible_distribution_major_version|int > 6
 
 - name: stop splunk
   service:

roles/splunk/tasks/configure_splunk_boot.yml

@@ -2,11 +2,11 @@
 - 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 == "true"
+  when: splunk_use_initd
   notify:
     - set ulimits in init.d
 
 - 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: splunk_use_initd == "false"
+  when: not splunk_use_initd

roles/splunk/tasks/install_apps.yml

@@ -20,19 +20,19 @@
     - name: Trigger failure if target_shc_group_name var is undefined
       fail:
         msg: "Please add a target_shc_group_name variable to the host_vars for your SH Deployer host(s) before proceeding."
-      when: not (target_shc_group_name is defined)
+      when: target_shc_group_name is not defined
 
     - name: Trigger failure if splunk_admin_username var is undefined
       fail:
         msg: "Please add a splunk_admin_username variable to the host_vars for your SHC hosts before proceeding."
-      when: not (splunk_admin_username is defined)
+      when: splunk_admin_username is not defined
 
     - name: Trigger failure if splunk_admin_password var is undefined
       fail:
         msg:
           - "Please add a splunk_admin_password variable to the host_vars or group_vars for your SHC hosts before proceeding."
           - "Tip: To encrypt the var value, you can use: ansible-vault encrypt_string --ask-vault-pass 'var_value_to_encrypt' --name 'splunk_admin_password' then, use the --ask-vault-pass argument when running the play."
-      when: not (splunk_admin_password is defined)
+      when: splunk_admin_password is not defined
 
     - name: Get SHC status from first SH under the "target_shc_group_name" inventory group specified in the shdeployer host_vars
       uri:
@@ -61,7 +61,6 @@
         - service_ready_state == false
 
   when: handler == "apply shcluster-bundle"
-  run_once: true
 
 - name: "Set default restart splunk handler for all other paths (e.g. etc/auth)"
   set_fact: