knife-vsphere 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06e3ee523488e2e14df1e267f2c980880a427e19
-  data.tar.gz: 7050570b79976dc09f12b4370176645a857e3894
+  metadata.gz: 8385a5227a8b7ca2a3df24c33ad157042949080a
+  data.tar.gz: a1389be7c172d6d83cd2212a3c783f0787e3814b
 SHA512:
-  metadata.gz: 6df9b92b2fe8a8ece228ca68104968c49943e6440ddbf239a590fd4de221836533cc665d5c5447e8188c1298c542966072570f44b05066a0afe7df28b0d96bc6
-  data.tar.gz: 733ec8e53a9930bb05632f5d8864d19bfa51c5eb44ef8ac068a532127bfe6141ee7147c05751954c5cb9db4b865100f0f45a700fb36d98d2aacad1b587c78614
+  metadata.gz: 5a109cb170ebcd0708e395efcc4258aca961fd1f32454559533501de58a37401c0165da0964a74a79556ed4fcdd40c2563bc913155047cb4c0233e074484529d
+  data.tar.gz: 9cdb024fe3a930c80eefa15d122c2ab7f696723da86f436544873b0611620b9fd6f41629d78e68454f8983a5635f697e052e334ce897ae635f5d96ef6f70e8cc

data/lib/chef/knife/base_vsphere_command.rb

@@ -7,6 +7,7 @@
 require 'chef/knife'
 require 'rbvmomi'
 require 'base64'
+require 'filesize'
 
 # Base class for vsphere knife commands
 class Chef

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -344,10 +344,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       config[:distro] = 'windows-chef-client-msi' if config[:distro].nil? || config[:distro] == 'chef-full'
       unless config[:disable_customization]
         # Wait for customization to complete
-        # TODO: Figure out how to find the customization complete event from the vsphere logs. The
-        #       customization can take up to 10 minutes to complete from what I have seen perhaps
-        #       even longer. For now I am simply sleeping, but if anyone knows how to do this
-        #       better fix it.
         puts 'Waiting for customization to complete...'
         CustomizationHelper.wait_for_sysprep(vm, vim, get_config(:sysprep_timeout), 10)
         puts 'Customization Complete'

data/lib/chef/knife/vsphere_vm_disk_extend.rb

@@ -0,0 +1,66 @@
+#
+# Author:: Malte Heidenreich (https://github.com/mheidenr)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+
+class Chef::Knife::VsphereVmDiskExtend < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere vm disk extend VMNAME SIZE. Extends the disk of vm VMNAME to SIZE kilobytes.'
+
+  common_options
+
+  option :diskname,
+         long: '--diskname DISKNAME',
+         description: 'The name of the disk that will be extended'
+
+  def run
+    $stdout.sync = true
+    vmname = @name_args[0]
+    if vmname.nil?
+      show_usage
+      fatal_exit('You must specify a virtual machine name')
+    end
+
+    size = @name_args[1]
+    if size.nil? || !size.match(/^\d+$/)
+      show_usage
+      fatal_exit('You must specify the new disk size')
+    end
+
+    disk_name = get_config(:diskname) unless get_config(:diskname).nil?
+
+    vim_connection
+
+    dc = datacenter
+
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+
+    disks = vm.config.hardware.device.select do |device|
+      device.is_a?(RbVmomi::VIM::VirtualDisk) && (disk_name.nil? || device.deviceInfo.label == disk_name)
+    end
+
+    if disks.length > 1
+      names = disks.map { |disk| disk.deviceInfo.label }
+      abort("More than 1 disk found: #{names}, please use --diskname DISKNAME")
+    elsif disks.length == 0
+      abort('No disk found')
+    end
+
+    disk = disks[0]
+    disk.capacityInKB = size
+
+    vm.ReconfigVM_Task(spec:
+      RbVmomi::VIM::VirtualMachineConfigSpec(
+        deviceChange: [RbVmomi::VIM::VirtualDeviceConfigSpec(
+          device: disk,
+          operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation('edit'))]
+      )).wait_for_completion
+
+    puts 'Disk resized successfully'
+  end
+end

data/lib/chef/knife/vsphere_vm_disk_list.rb

@@ -0,0 +1,32 @@
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+
+# List the disks attached to a VM
+class Chef::Knife::VsphereVmDiskList < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere vm disk list VMNAME'
+
+  common_options
+
+  def run
+    $stdout.sync = true
+
+    unless vmname = @name_args[0]
+      show_usage
+      fatal_exit 'You must specify a virtual machine name'
+    end
+
+    vim_connection
+    vm = get_vm(vmname)
+    fatal_exit "Could not find #{vmname}" unless vm
+
+    disks = vm.config.hardware.device.select do |device|
+      device.is_a? RbVmomi::VIM::VirtualDisk
+    end
+
+    disks.each do |disk|
+      puts '%3d %20s %s' % [disk.unitNumber,
+                            disk.deviceInfo.label,
+                            Filesize.from("#{disk.capacityInKB} KB").pretty]
+    end
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: filesize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,8 @@ files:
 - lib/chef/knife/vsphere_vm_clone.rb
 - lib/chef/knife/vsphere_vm_config.rb
 - lib/chef/knife/vsphere_vm_delete.rb
+- lib/chef/knife/vsphere_vm_disk_extend.rb
+- lib/chef/knife/vsphere_vm_disk_list.rb
 - lib/chef/knife/vsphere_vm_execute.rb
 - lib/chef/knife/vsphere_vm_find.rb
 - lib/chef/knife/vsphere_vm_list.rb