knife-vsphere 1.2.13 → 1.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92495960a0105c5c704b19d8a0a74c0c88632391
-  data.tar.gz: bb30bd0c5d075f7b122231366c14d0d51da72bd1
+  metadata.gz: 5568fb262d8a952f210fb7a7100f54bbc4c0c989
+  data.tar.gz: 2d103c82c324bf3f9577adc8a92583771ce5ccd1
 SHA512:
-  metadata.gz: a0bd94602e0ab3537796afe7b46bd7502e63b3b2e34d299136e95d11d79958e781afc8822bb03766915bef61d1016637d366f041edb269db0035f6dbc492d797
-  data.tar.gz: 964a90190d4d099458b929b5d69a00e82187d76b216a157a7393bea31ecc8f9d3d932fc58f2615eb060d05f0a7b93712bbbc67f9eba809e27347257199dc7701
+  metadata.gz: 96ccd1409e9573d2c26038163c32bfecb2d3d365d1b2af493ca1d0eb475fcd5f7a2a60a48a656f2d1dd26775da9f692fed192abdfe5281c9c159523cc3ff63a4
+  data.tar.gz: 9106e7eb45638e26928413b0fc2a6406bb79ab2023515edda7e5c8415e0e686ad137ba5fc54d834df694bb70033707e8bcd37489e7b40920d420ec6d900d72f4

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -90,7 +90,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
   option :customization_macs,
          long: '--cmacs CUST_MACS',
-         description: 'Comma-delimited list of MAC addresses for network adapters'
+         description: 'Comma-delimited list of MAC addresses for network adapters',
+         default: 'auto'
 
   option :customization_ips,
          long: '--cips CUST_IPS',
@@ -335,6 +336,9 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
     task = src_vm.CloneVM_Task(folder: dest_folder, name: vmname, spec: clone_spec)
     puts "Cloning template #{config[:source_vm]} to new VM #{vmname}"
+
+    pp clone_spec if log_verbose?
+
     task.wait_for_completion
     puts "Finished creating virtual machine #{vmname}"
 
@@ -533,17 +537,16 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       clone_spec.config.memoryMB = Integer(get_config(:customization_memory)) * 1024
     end
 
-    if get_config(:customization_macs)
-      unless get_config(:customization_ips)
+    if get_config(:customization_macs) && !get_config(:customization_ips)
         abort('Must specify IP numbers with --cips when specifying MAC addresses with --cmacs, can use "dhcp" as placeholder')
-      end
-      mac_list = if get_config(:customization_macs) == 'auto'
-                   ['auto'] * get_config(:customization_ips).split(',').length
-                 else
-                   get_config(:customization_macs).split(',')
-                 end
     end
 
+    mac_list = if get_config(:customization_macs) == 'auto'
+                 ['auto'] * get_config(:customization_ips).split(',').length
+               else
+                 get_config(:customization_macs).split(',')
+               end
+
     if get_config(:customization_sw_uuid)
       unless get_config(:customization_vlan)
         abort('Must specify VLANs with --cvlan when specifying switch UUIDs with --sw-uuids')

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.13'
+  VERSION = '1.2.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.13
+  version: 1.2.14
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize