knife-vsphere 1.2.25 → 1.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c7890777dfc302edf4752175fba9188c8b71b8a
-  data.tar.gz: 04f9c9a57bc4bdb19c7475f312764a1f39e03733
+  metadata.gz: 060509d9604ac932b4808fc732e6fba41602b1c6
+  data.tar.gz: 44f9be0f47b5a38e67916cb1b0dcb87fb94c67e5
 SHA512:
-  metadata.gz: 8c5ae461b014eed7ba88ff2614e3b09251f4b4655fa1ed63f3aa03dd9c783317b0af59957e87ed62b989f1d69df72c997cfc0135df112a0b1fe166db5bebf013
-  data.tar.gz: 85a25e046311e8608966dc5d6b2a958f171639267e63df2ffb623f81500665a7074ef2c076b1a524959c89144b39151be90155fb7c8ec437b9c71f1d9066f8d4
+  metadata.gz: a1d09af5a783b1b6a06f0bbfef2078187a9785a3397fca2cf6578d5d9d330ec397335716361db47c8502185eeaed146598a51533407ec939ba39c7152670934b
+  data.tar.gz: 37f379b2b0a787489e83785b4d761844d523fecd713e1112e69901b21e56fef0854ced1a53b686875c9aeea5b60fffeeae31c904b32febcda41f807dad2da8f3

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -127,10 +127,18 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
          long: '--ccpu CUST_CPU_COUNT',
          description: 'Number of CPUs'
 
+  option :customization_corespersocket,
+         long: '--ccorespersocket CUST_CPU_CORES_PER_SOCKET',
+         description: 'Number of CPU Cores per Socket'
+
   option :customization_memory,
          long: '--cram CUST_MEMORY_GB',
          description: 'Gigabytes of RAM'
 
+  option :customization_memory_reservation,
+         long: '--cram_reservation CUST_MEMORY_RESERVATION_GB',
+         description: 'Gigabytes of RAM'
+
   option :power,
          long: '--start',
          description: 'Indicates whether to start the VM after a successful clone',
@@ -574,10 +582,18 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       clone_spec.config.numCPUs = get_config(:customization_cpucount)
     end
 
+    if get_config(:customization_corespersocket)
+      clone_spec.config.numCoresPerSocket = get_config(:customization_corespersocket)
+    end
+
     if get_config(:customization_memory)
       clone_spec.config.memoryMB = Integer(get_config(:customization_memory)) * 1024
     end
 
+    if get_config(:customization_memory_reservation)
+      clone_spec.config.memoryAllocation = RbVmomi::VIM.ResourceAllocationInfo reservation: Integer(Float(get_config(:customization_memory_reservation)) * 1024)
+    end
+
     mac_list = if get_config(:customization_macs) == AUTO_MAC
                  [AUTO_MAC] * get_config(:customization_ips).split(',').length
                else

data/lib/chef/knife/vsphere_vm_find.rb

@@ -19,6 +19,10 @@ class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
          short: '-h',
          description: 'Target pool'
 
+  option :poolpath,
+         long: '--pool-path',
+         description: 'Pool is full-path'
+
   option :esx_disk,
          long: '--esx-disk',
          description: 'Show esx disks'
@@ -121,9 +125,11 @@ class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
     vim_connection
     dc = datacenter
     folder = dc.hostFolder
-
-    pool = traverse_folders_for_pool_clustercompute(folder, poolname) || abort("Pool #{poolname} not found")
-
+    pool = if get_config(:poolpath)
+             find_pool(poolname) || abort("Pool #{poolname} not found")
+           else
+             traverse_folders_for_pool_clustercompute(folder, poolname) || abort("Pool #{poolname} not found")
+           end
     vm = if pool.class == RbVmomi::VIM::ResourcePool
            pool.vm
          else

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.25'
+  VERSION = '1.2.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.25
+  version: 1.2.26
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize