Merge pull request #43 from msurato/master

Fix wait parameter

Author: nmaludy

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 
 ## Development
 
+* Fixed a bug with a hard coded wait for reboot. (Bug Fix)
+
+Contributed by Michael Surato (@msurato)
 
 ## Release 1.0.1 (2020-03-04)
 

plans/init.pp

@@ -218,9 +218,10 @@
 
       ## Check if reboot required and reboot if true.
       run_plan('patching::reboot_required', $update_ok_targets,
-                strategy => $reboot_strategy_group,
-                message  => $reboot_message_group,
-                noop     => $noop)
+                strategy    => $reboot_strategy_group,
+                message     => $reboot_message_group,
+                reboot_wait => $reboot_wait,
+                noop        => $noop)
 
       ## Remove VM snapshots
       if $snapshot_delete_group and $snapshot_plan_group and $snapshot_plan_group != 'disabled' {

plans/reboot_required.pp

@@ -31,10 +31,11 @@
 #    - `resultset` : results from the `reboot` plan for the attempted hosts (potentially an empty `ResultSet`)
 #
 plan patching::reboot_required (
-  TargetSpec $targets,
+  TargetSpec        $targets,
   Enum['only_required', 'never', 'always'] $strategy = 'only_required',
-  String $message = 'NOTICE: This system is currently being updated.',
-  Boolean $noop   = false,
+  String            $message     = 'NOTICE: This system is currently being updated.',
+  Boolean           $noop        = false,
+  Optional[Integer] $reboot_wait = 300,
 ) {
   $_targets = run_plan('patching::get_targets', $targets)
   $group_vars = $_targets[0].vars
@@ -62,7 +63,7 @@
         if !$targets_reboot_required.empty() {
           $targets_reboot_attempted = $targets_reboot_required
           $reboot_resultset = run_plan('reboot', $targets_reboot_required,
-                                        reconnect_timeout => 300,
+                                        reconnect_timeout => $reboot_wait,
                                         message           => $_message,
                                         _catch_errors     => true)
         }
@@ -74,7 +75,7 @@
       'always': {
         $targets_reboot_attempted = $targets
         $reboot_resultset = run_plan('reboot', $targets,
-                                      reconnect_timeout => 300,
+                                      reconnect_timeout => $reboot_wait,
                                       message           => $_message,
                                       _catch_errors     => true)
       }