Merge pull request #4 from groggemans/add_params

Added more parameters

Author: G. Roggemans

README.md

@@ -14,16 +14,18 @@ A role for rebooting hosts.
 
 ## Role Variables
 
-| Variable                  | Description                                             | Default value                              |
-|---------------------------|---------------------------------------------------------|--------------------------------------------|
-| `reboot_message`          | Reboot message for the logs                             | 'Reboot by Ansible'                        |
-| `reboot_wait`             | Wait for hosts to come back online?                     | 'yes'                                      |
-| `reboot_wait_host`        | Host to check                                           | `ansible_ssh_host` or `inventory_hostname` |
-| `reboot_wait_port`        | Port to check                                           | `ansible_ssh_port` or 22                   |
-| `reboot_wait_delay`       | Time to wait before polling the host (seconds)          | 10                                         |
-| `reboot_wait_timeout`     | Timeout for host to come back up successfully (seconds) | 300                                        |
-| `reboot_interval`         | Interval between reboot and next task?                  | 'no'                                       |
-| `reboot_interval_seconds` | Seconds to pause after reboot                           | 0                                          |
+| Variable                  | Description                                               | Default value                              |
+|---------------------------|-----------------------------------------------------------|--------------------------------------------|
+| `reboot_message`          | Reboot message for the logs                               | 'Reboot by Ansible'                        |
+| `reboot_wait`             | Wait for hosts to come back online?                       | 'yes'                                      |
+| `reboot_wait_host`        | Host to check                                             | `ansible_ssh_host` or `inventory_hostname` |
+| `reboot_wait_port`        | Port to check                                             | `ansible_ssh_port` or 22                   |
+| `reboot_wait_regex`       | String to match in the socket connection. (ex. `OpenSSH`) | /                                          |
+| `reboot_wait_delay`       | Time to wait before polling the host (seconds)            | 10                                         |
+| `reboot_wait_timeout`     | Timeout for host to come back up successfully (seconds)   | 300                                        |
+| `reboot_wait_ctimeout`    | Timeout for each connection attempt (seconds)             | 5                                          |
+| `reboot_interval`         | Interval between reboot and next task?                    | 'no'                                       |
+| `reboot_interval_seconds` | Seconds to pause after reboot                             | 0                                          |
 
 #### Attention:
 All boolean values can be used with either `'yes'`/`'no'` or `true`/`false`.

defaults/main.yml

@@ -13,6 +13,9 @@ reboot_wait_delay: 10
 # Timeout for host to come back up successfully
 reboot_wait_timeout: 300
 
+# Timeout for each connection attempt
+reboot_wait_ctimeout: 5
+
 # Interval after reboot?
 reboot_interval: 'no'
 

tasks/main.yml

@@ -30,6 +30,8 @@
       state=started
       delay="{{ reboot_wait_delay }}"
       timeout="{{ reboot_wait_timeout }}"
+      search_regex="{{ reboot_wait_regex | default(omit) }}"
+      connect_timeout="{{ reboot_wait_ctimeout }}"
   when: reboot_wait|string in 'True.true.Yes.yes'
     # Checked as string to make sure it can be specified from the command line.