knife-vsphere 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc8369abb89134912a7e683ce60b1bbd0e8d484f
-  data.tar.gz: 813c2580d02825cd3d14376b5a4e18d982cb6cf7
+  metadata.gz: 4e7d771892c01c114d0b2ae5b9b2ab7141d61ec7
+  data.tar.gz: f46bfb78ccd6f6592cc2665b28fcf988729738c9
 SHA512:
-  metadata.gz: 46f01a944324a64476df295187ba4859ade28677c4a47c62c3e1603e1804150fa60d0db72fa2ac829e0f14e49cb8a4e05ff9646abd4f30674bbf727fbb088d61
-  data.tar.gz: ccaa4f2c5d8a44349ad90e36a56c041f10ecb9479062daa44fd63953c9f8b41440b3cc259571db7e76f5c55bba16d062f293a056c1cbc32441fce9e5a526d3f3
+  metadata.gz: 5ca0f046ff4ce88d80b37f78205a8186979bcca9402c9bbbcff7ac1fc55b009661bf35ff078a1fef3a0d53d38f17f75693e574b9b00badda0b7b634144b1ceb3
+  data.tar.gz: 7d355eaac4b81689489aa2dda67559c934a609ffef5a5b94e74400e34701515d47904aa1fd540ca24a6f5177d64bb5715adcfdc4ad33b5abda360882d585eee3

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -376,7 +376,17 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
     pp clone_spec if log_verbose?
 
-    task.wait_for_completion
+    begin
+      task.wait_for_completion
+    rescue RbVmomi::Fault => e
+      fault = e.fault
+      if fault.class == RbVmomi::VIM::NicSettingMismatch
+        abort "There is a mismatch in the number of NICs on the template (#{fault.numberOfNicsInVM}) and what you've passed on the command line with --cips (#{fault.numberOfNicsInSpec}). The VM has been cloned but not customized."
+      else
+        raise e
+      end
+    end
+
     puts "Finished creating virtual machine #{vmname}"
 
     if customization_plugin && customization_plugin.respond_to?(:reconfig_vm)

data/lib/chef/knife/vsphere_vm_delete.rb

@@ -70,8 +70,7 @@ class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
       vmname = config[:chef_node_name] if config[:chef_node_name]
       destroy_item(Chef::Node, vmname, 'node')
       destroy_item(Chef::ApiClient, vmname, 'client')
-    else
-      puts "Corresponding node and client for the #{vmname} server were not deleted and remain registered with the Chef Server"
+      puts "Corresponding node and client for the #{vmname} server were deleted and unregistered with the Chef Server"
     end
   end
 end

data/lib/chef/knife/vsphere_vm_snapshot.rb

@@ -60,6 +60,11 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
          description: 'Quiesce the VM prior to snapshotting',
          default: false
 
+  option :snapshot_description,
+         long: '--snapshot-descr DESCR',
+         description: 'Snapshot description',
+         default: ''
+
   def run
     $stdout.sync = true
 
@@ -94,7 +99,7 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
 
     if get_config(:create_new_snapshot)
       snapshot_task = vm.CreateSnapshot_Task(name: get_config(:create_new_snapshot),
-                                             description: '',
+                                             description: get_config(:snapshot_description),
                                              memory: get_config(:dump_memory),
                                              quiesce: get_config(:quiesce))
       snapshot_task = snapshot_task.wait_for_completion if get_config(:wait)
@@ -142,12 +147,13 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
   end
 
   def display_node(node, current, shift = 1)
+    descr = node.name + ' ' + node.createTime.iso8601
     out = ''
     out << '+--' * shift
     if node.snapshot == current
-      out << "#{ui.color(node.name, :cyan)}" << "\n"
+      out << ui.color(descr, :cyan) << '\n'
     else
-      out << "#{node.name}" << "\n"
+      out << descr << '\n'
     end
     unless node.childSnapshotList.empty?
       node.childSnapshotList.each { |item| out << display_node(item, current, shift + 1) }

data/lib/knife-vsphere/version.rb

@@ -1,5 +1,5 @@
 # The main knife-vsphere module.
 module KnifeVsphere
   # The version of this gem.
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife