knife-vsphere 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aea942c90a02f06deeb77fbe50dd26f37e212ea4
-  data.tar.gz: 7cc34e56a9e777bd7a274f6da1992d84297dd9f6
+  metadata.gz: 867be765e86a718b3a33a8a4559e35fb5d92b11f
+  data.tar.gz: 8a3cba39a12cff1259b8e56f1f787287293af382
 SHA512:
-  metadata.gz: 1391c8bb2f128389551566f7875fffea0e4d542550bcf76f76a698280b944bb009ea36bc707f89c588a3b68d2df20a1ca80621b44186648f0d2c8a0318c23740
-  data.tar.gz: 9ce238c263f9d7dd2dfd2a8c35311f87fb252e86734d81a5915a9fc5bcb23c23598ac4e71afa8fbba9ac6f1e506867ee49ac05ccb7dfc95aa15bdd6a78ca7237
+  metadata.gz: fa8a4deb6e743442b8eb47ea7c3b5853e2928e9f89e8ece3147fffa8c37348bcb1ab70d270338b467b92eb1c8c3c6da677c48fd5b3ebbc407ad0748fb9756af8
+  data.tar.gz: c2bbde499d57e6a36e5fc118e8025fec9fa0663d124cffbb802c7645b93b51fd5eeccd9e220858a83f913f9f347fdc0696274337a0e6675bb24bee175bfa3325

data/lib/chef/knife/vsphere_datastore_maxfree.rb

@@ -28,6 +28,10 @@ class Chef::Knife::VsphereDatastoreMaxfree < Chef::Knife::BaseVsphereCommand
          description: 'Regex to match the datastore name',
          default: ''
 
+  option :vlan,
+         long: '--vlan VLAN',
+         description: 'Require listed vlan available to datastore\'s parent'
+
   common_options
 
   def run
@@ -38,8 +42,14 @@ class Chef::Knife::VsphereDatastoreMaxfree < Chef::Knife::BaseVsphereCommand
     regex = /#{Regexp.escape(get_config(:regex))}/
     dc = config[:vim].serviceInstance.find_datacenter(dcname) || abort('datacenter not found')
     max = nil
-    dc.datastore.each do |store|
-      if regex.match(store.name) && (max.nil? || max.summary[:freeSpace] < store.summary[:freeSpace])
+    datastores = if get_config(:vlan)
+                   find_network(get_config(:vlan)).host.map(&:datastore).flatten
+                 else
+                   dc.datastore
+                 end
+    datastores.each do |store|
+      if regex.match(store.name) &&
+         (max.nil? || max.summary[:freeSpace] < store.summary[:freeSpace])
         max = store
       end
     end

data/lib/chef/knife/vsphere_vm_wait_sysprep.rb

@@ -44,8 +44,8 @@ class Chef::Knife::VsphereVmWaitSysprep < Chef::Knife::BaseVsphereCommand
     sleep_time = get_config(:sleep).to_i
     sleep_timeout = get_config(:timeout).to_i
 
-    vim = get_vim_connection
-    dc = get_datacenter
+    vim = vim_connection
+    dc = datacenter
 
     folder = find_folder(get_config(:folder)) || dc.vmFolder
     vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM could not be found in #{folder}")

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.0'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr