knife-vsphere 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e7d771892c01c114d0b2ae5b9b2ab7141d61ec7
-  data.tar.gz: f46bfb78ccd6f6592cc2665b28fcf988729738c9
+  metadata.gz: 5f069c4c03cfac41d16940d9a0001ce6e5782baf
+  data.tar.gz: 747a52f56b215dfbee8b1c5260422513f0fcc5f6
 SHA512:
-  metadata.gz: 5ca0f046ff4ce88d80b37f78205a8186979bcca9402c9bbbcff7ac1fc55b009661bf35ff078a1fef3a0d53d38f17f75693e574b9b00badda0b7b634144b1ceb3
-  data.tar.gz: 7d355eaac4b81689489aa2dda67559c934a609ffef5a5b94e74400e34701515d47904aa1fd540ca24a6f5177d64bb5715adcfdc4ad33b5abda360882d585eee3
+  metadata.gz: ee2324c39ef703042d4aa565c9af42c18f9dd91a582ac6af875c8d691b17662a6df07162ad7a6265672eeecacd3ca9a6b53f3238a19773c5bb3bb74fcfba57a0
+  data.tar.gz: d9ef842ef5b50f283086b6a28efdbc8c5df0d0f6d259498f51c149b9c7c7576ca189328640568c47c443032b0665af03b03767e57f7e3193ec989635ccb39a84

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -382,6 +382,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       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."
+      elsif fault.class == RbVmomi::VIM::DuplicateName
+        ui.info 'VM already exists, proceeding to bootstrap'
       else
         raise e
       end
@@ -398,7 +400,11 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     if get_config(:power) || get_config(:bootstrap)
       vm = find_in_folder(dest_folder, RbVmomi::VIM::VirtualMachine, vmname) ||
            fatal_exit("VM #{vmname} not found")
-      vm.PowerOnVM_Task.wait_for_completion
+      begin
+        vm.PowerOnVM_Task.wait_for_completion
+      rescue RbVmomi::Fault => e
+        raise e unless e.fault.class == RbVmomi::VIM::InvalidPowerState # Ignore if it's already turned on
+      end
       puts "Powered on virtual machine #{vmname}"
     end
 

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.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: chef-vault
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement