knife-vsphere 1.2.1 → 1.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 867be765e86a718b3a33a8a4559e35fb5d92b11f
|
|
4
|
+
data.tar.gz: 8a3cba39a12cff1259b8e56f1f787287293af382
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fa8a4deb6e743442b8eb47ea7c3b5853e2928e9f89e8ece3147fffa8c37348bcb1ab70d270338b467b92eb1c8c3c6da677c48fd5b3ebbc407ad0748fb9756af8
|
|
7
|
+
data.tar.gz: c2bbde499d57e6a36e5fc118e8025fec9fa0663d124cffbb802c7645b93b51fd5eeccd9e220858a83f913f9f347fdc0696274337a0e6675bb24bee175bfa3325
|
|
@@ -28,6 +28,10 @@ class Chef::Knife::VsphereDatastoreMaxfree < Chef::Knife::BaseVsphereCommand
|
|
|
28
28
|
description: 'Regex to match the datastore name',
|
|
29
29
|
default: ''
|
|
30
30
|
|
|
31
|
+
option :vlan,
|
|
32
|
+
long: '--vlan VLAN',
|
|
33
|
+
description: 'Require listed vlan available to datastore\'s parent'
|
|
34
|
+
|
|
31
35
|
common_options
|
|
32
36
|
|
|
33
37
|
def run
|
|
@@ -38,8 +42,14 @@ class Chef::Knife::VsphereDatastoreMaxfree < Chef::Knife::BaseVsphereCommand
|
|
|
38
42
|
regex = /#{Regexp.escape(get_config(:regex))}/
|
|
39
43
|
dc = config[:vim].serviceInstance.find_datacenter(dcname) || abort('datacenter not found')
|
|
40
44
|
max = nil
|
|
41
|
-
|
|
42
|
-
|
|
45
|
+
datastores = if get_config(:vlan)
|
|
46
|
+
find_network(get_config(:vlan)).host.map(&:datastore).flatten
|
|
47
|
+
else
|
|
48
|
+
dc.datastore
|
|
49
|
+
end
|
|
50
|
+
datastores.each do |store|
|
|
51
|
+
if regex.match(store.name) &&
|
|
52
|
+
(max.nil? || max.summary[:freeSpace] < store.summary[:freeSpace])
|
|
43
53
|
max = store
|
|
44
54
|
end
|
|
45
55
|
end
|
|
@@ -44,8 +44,8 @@ class Chef::Knife::VsphereVmWaitSysprep < Chef::Knife::BaseVsphereCommand
|
|
|
44
44
|
sleep_time = get_config(:sleep).to_i
|
|
45
45
|
sleep_timeout = get_config(:timeout).to_i
|
|
46
46
|
|
|
47
|
-
vim =
|
|
48
|
-
dc =
|
|
47
|
+
vim = vim_connection
|
|
48
|
+
dc = datacenter
|
|
49
49
|
|
|
50
50
|
folder = find_folder(get_config(:folder)) || dc.vmFolder
|
|
51
51
|
vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM could not be found in #{folder}")
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: knife-vsphere
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.2.
|
|
4
|
+
version: 1.2.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ezra Pagel
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-07-
|
|
11
|
+
date: 2015-07-03 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: netaddr
|