Merge pull request #4 from broferek/master

Use new Ansible 2.7 Linux reboot module

Author: angrox

defaults/main.yml

@@ -7,8 +7,6 @@
 # minimal-security                   = yum --security update-minimal
 # minimal-security-severity:Critical =  --sec-severity=Critical update-minimal
 yum_update_command: minimal-security
-wait_ssh_down_timeout: 120
-wait_ssh_up_timeout: 500
 disabled_repos: ''
 enabled_repos: ''
 excluded_packages: ''

handlers/main.yml

@@ -1,9 +0,0 @@
-- name: Wait ssh down after server_reboot
-  local_action: wait_for host={{ inventory_hostname }} port=22 delay=0 timeout={{ wait_ssh_down_timeout }} state=stopped
-  become: false
-  listen: waitfor_server
-
-- name: Wait ssh up after server reboot 
-  local_action: wait_for host={{ inventory_hostname }} state=started port=22 delay=30 timeout={{ wait_ssh_up_timeout }}
-  become: false
-  listen: waitfor_server

tasks/main.yml

@@ -52,9 +52,9 @@
     update_cache: yes
     name: '*'
     state: latest
-    exclude: '{{ excluded_packages }}'
-    disablerepo: '{{ disabled_repos }}'    
-    enablerepo: '{{ enabled_repos }}'    
+    exclude: '{{ excluded_packages | default(omit, true) }}'
+    disablerepo: '{{ disabled_repos | default(omit, true) }}'
+    enablerepo: '{{ enabled_repos | default(omit, true) }}'
   when: update_all is defined
   tags:
     - update_all
@@ -67,14 +67,8 @@
       failed_when: reboot_required.rc not in [0,1]
 
     - name: restart_server
-      command: /usr/bin/systemd-run --on-active=10 /usr/bin/systemctl reboot
-      async: 0
-      poll: 0
-      ignore_errors: true
+      reboot:
       when: reboot_required.rc == 1 and do_reboot is defined
-      notify:
-       - waitfor_server
-
 
 - when: ansible_distribution_major_version == "6"
   block:
@@ -83,14 +77,8 @@
       register: reboot_required
 
     - name: restart_server
-      shell: sleep 2 && shutdown -r now "Reboot triggered by Ansible" 
-      async: 0
-      poll: 0
-      ignore_errors: true
+      reboot:
       when: reboot_required.stdout != "" and do_reboot is defined
-      notify:
-       - waitfor_server
-