Merge branch 'master' into feature/facts

Author: nmaludy

CHANGELOG.md

@@ -11,6 +11,16 @@ All notable changes to this project will be documented in this file.
 
   Contributed by Nick Maludy (@nmaludy)
 
+* Fixed a bug with a hard coded wait for reboot. (Bug Fix)
+
+Contributed by Michael Surato (@msurato)
+
+* Add `hostname` as a choice for patching::snapshot_vmware::target_name_property
+  It can be used in cases where target discovery uses fully qualified domain names
+  and VM names don't have domain name component
+
+  Contributed by Vadym Chepkov (@vchepkov)
+
 ## Release 1.0.1 (2020-03-04)
 
 * Ensure the `patching.json` file exists on Windows by creating a blank file if it was previously missing.

functions/target_names.pp

@@ -3,16 +3,19 @@
 # @param [TargetSpec] targets
 #   List of targets to extract the name from
 #
-# @param [Enum['name', 'uri']] name_property
+# @param [Enum['hostname', 'name', 'uri']] name_property
 #   Property in the Target to use as the name
 #
 # @return [Array[String]] Array of names, one for each target
 function patching::target_names(
   TargetSpec          $targets,
-  Enum['name', 'uri'] $name_property,
+  Enum['hostname', 'name', 'uri'] $name_property,
 ) >> Array[String] {
   $targets.map |$n| {
     case $name_property {
+      'hostname': {
+        regsubst($n.uri, '^([^.]+).*','\1')
+      }
       'name': {
         $n.name
       }

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)
       }

plans/snapshot_vmware.pp

@@ -19,7 +19,7 @@
 #     - `create` creates a new snapshot
 #     - 'delete' deletes snapshots by matching the `snapshot_name` passed in.
 #
-# @param [Optional[Enum['name', 'uri']]] target_name_property
+# @param [Optional[Enum['hostname', 'name', 'uri']]] target_name_property
 #   Determines what property on the Target object will be used as the VM name when
 #   mapping the Target to a VM in vSphere.
 #
@@ -28,6 +28,8 @@
 #       list is set as the `uri` and not the `name`, in this case `name` will be `undef`.
 #    - `name` : use the `name` property on the Target, this is not preferred because
 #       `name` is usually a short name or nickname.
+#    - `hostname`: use the `hostname` value to use host component of `uri` property on the Target
+#      this can be useful if VM name doesn't include domain name
 #
 # @param [String[1]] vsphere_host
 #   Hostname of the vSphere server that we're going to use to create snapshots via the API.
@@ -63,7 +65,7 @@
 plan patching::snapshot_vmware (
   TargetSpec $targets,
   Enum['create', 'delete'] $action,
-  Optional[Enum['name', 'uri']] $target_name_property = undef,
+  Optional[Enum['hostname', 'name', 'uri']] $target_name_property = undef,
   String[1] $vsphere_host       = get_targets($targets)[0].vars['vsphere_host'],
   String[1] $vsphere_username   = get_targets($targets)[0].vars['vsphere_username'],
   String[1] $vsphere_password   = get_targets($targets)[0].vars['vsphere_password'],