Merge pull request #235 from DinMouMou/master

Modify check_ssh role to use wait_for_connection module

Author: greg-hellings

cinch/roles/check_ssh/defaults/main.yml

@@ -1,3 +1,2 @@
-ssh_retries: 100
+ssh_timeout: 600
 ssh_retry_delay: 6
-host: "{{ hostvars[inventory_hostname]['ansible_host'] | default(inventory_hostname) }}"

cinch/roles/check_ssh/tasks/main.yml

@@ -1,23 +1,5 @@
-- block:
-  - name: verify that configured SSH private key is a file and has permissions of 0600
-    local_action: file path="{{ ansible_ssh_private_key_file }}" state=file mode=0600
-    tags:
-      - skip_ansible_lint
-
-  - name: construct command line for SSH check
-    set_fact:
-      check_ssh_cmd: >-
-        ansible --ssh-extra-args='-o StrictHostKeyChecking=no'
-        -i '{{ inventory_dir }}/{{ (inventory_file | string | default('')) | basename }}'
-        {{ host }} -m ping
-
-  - name: check for SSH connectivity and authentication
-    local_action: shell {{ check_ssh_cmd }}
-    register: result
-    changed_when: "result.rc != 0"
-    until: result.rc == 0
-    retries: "{{ ssh_retries }}"
-    delay: "{{ ssh_retry_delay }}"
-    tags:
-      - skip_ansible_lint
+- name: wait for ssh connection
+  wait_for_connection:
+    sleep: '{{ ssh_retry_delay }}'
+    timeout: '{{ ssh_timeout }}'
   when: ansible_connection == 'ssh'