cleaned up logic
diff --git a/meta/main.yml b/meta/main.yml
index f04a6d7..1a5c922 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -12,7 +12,5 @@
galaxy_tags:
- apigee
- opdk
-dependencies: []
- # List your role dependencies here, one per line.
- # Be sure to remove the '[]' above if you add dependencies
- # to this list.
\ No newline at end of file
+dependencies:
+- { role: apigee-opdk-setup-default-settings }
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index 30af235..fa52134 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,29 +1,34 @@
---
-- name: Permanently disable SELINUX
- selinux: state=disabled
-
- name: Refresh setup facts
setup:
+- name: Set restart_needed
+ set_fact:
+ restart_needed: ansible_selinux.status | lower != 'disabled' | bool
+
+- name: Permanently disable SELINUX
+ selinux: state=disabled
+ when: restart_needed
+
- name: Restart node
debug:
msg: 'SELinux MUST be disabled, selinux has been updated, restarting node now...'
- when: "{{ ansible_selinux.status | lower != 'disabled' }}"
+ when: restart_needed
- name: Restarting node now
ignore_errors: yes
become: yes
shell: 'reboot now'
- when: "{{ ansible_selinux.status | lower != 'disabled' }}"
+ when: restart_needed
async: 0
poll: 0
- name: Waiting for server to complete restarting
become: no
local_action: wait_for host='{{ ansible_host }}' state=started delay=60 timeout='{{ server_restart_timeout }}'
- when: "{{ ansible_selinux.status | lower != 'disabled' and (server_restart is defined and server_restart | bool )}}"
+ when: restart_needed
- name: Server usually needs a little more time ...
become: no
- local_action: wait_for host='{{ ansible_host }}' state=started delay=30
- when: "{{ ansible_selinux.status | lower != 'disabled' and (server_restart is defined and server_restart | bool )}}"
+ local_action: wait_for host='{{ ansible_host }}' state=started delay=60
+ when: restart_needed
