knife-vsphere 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77a04602d5afe6a6817798b672a8b0ef3391fa2a
-  data.tar.gz: d8f7b4d9e54717ac3c16c5f363c1f9169250cf04
+  metadata.gz: 1b99f48fa873d629a1882d1f8f269fa314014fea
+  data.tar.gz: 980c7c2071e841eb6008515308d4241f9196dc94
 SHA512:
-  metadata.gz: 141c9bd5a3ba87d99c35e55b3aea268d37c73480fe3b20cfca3735d661c5878510e1938ba4a7d872062e1a6bce27edb1cbc2b004da29d0051fefe8930758d57a
-  data.tar.gz: 3c64b651ec747c0724dd991a6b9dd6fe16d751921f55f9f5497299680b97305452af4d489ebaf2456231c359c7339f9ced911c1826392c1a106168b74fbd8492
+  metadata.gz: 77f5f85d54f7e1df223cba68410c076ff732bb3a7e5379bed7e331c45e307f7911f7ea68e26662dc6857e7bead771a43436442636bed9a9c98a6b38bf54b1a37
+  data.tar.gz: cfc52c14fff451c70b0f0878fef47ce45bac4a41c74089dba8315ada86ad62329456be23fb723282447e7fff706d2ee6a804724308bc30a435700d73d22a953e

data/lib/chef/knife/vsphere_datastore_file.rb

@@ -0,0 +1,51 @@
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+
+# Upload or download a file from a datastore
+class Chef::Knife::VsphereDatastoreFile < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere datastore file'
+
+  common_options
+
+  option :local_file,
+         long: '--local-file FILE',
+         short: '-f',
+         description: 'Local file and path'
+
+  option :remote_file,
+         long: '--remote-file FILE',
+         short: '-r',
+         description: 'Remote file and path'
+
+  option :upload,
+         long: '--upload-file',
+         short: '-u',
+         description: 'Upload local file to remote'
+
+  option :download,
+         long: '--download-file',
+         short: '-D',
+         description: 'Download remote file to local'
+
+  def run
+    $stdout.sync = true
+
+    unless get_config(:upload) || get_config(:download)
+      show_usage
+      fatal_exit('You must specify either upload or download')
+    end
+    unless get_config(:local_file) && get_config(:remote_file)
+      show_usage
+      fatal_exit('You must specify both local-file and remote-file')
+    end
+
+    vim_connection
+    datastore = find_datastore(@name_args[0])
+    if get_config(:upload)
+      datastore.upload(get_config(:remote_file), get_config(:local_file))
+    elsif get_config(:download)
+      datastore.download(get_config(:remote_file), get_config(:local_file))
+    end
+  end
+end

data/lib/chef/knife/vsphere_vm_cdrom.rb

@@ -0,0 +1,110 @@
+# License:: Apache License, Version 2.0
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+class Chef::Knife::VsphereVmCdrom < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere vm cdrom VMNAME (options)'
+
+  common_options
+
+  option :datastore,
+         long: '--datastore STORE',
+         description: 'The datastore for an iso source'
+
+  option :iso,
+         long: '--iso ISO',
+         description: 'The name and path of the ISO to attach'
+
+  option :attach,
+         short: '-a',
+         long: '--attach',
+         description: 'Attach the virtual cdrom to the VM'
+
+  option :disconnect,
+         long: '--disconnect',
+         description: 'Disconnect the virtual cdrom from the VM'
+
+  option :on_boot,
+         long: '--on_boot ONBOOT',
+         description: 'False for Detached on boot or True for Attached on boot'
+
+  option :client_device,
+         long: '--client_device',
+         description: 'Set the backing store to client-device'
+
+  option :recursive,
+         short: '-r',
+         long: '--recursive',
+         description: 'Search all folders'
+
+  def run
+    $stdout.sync = true
+
+    vmname = @name_args[0]
+    if vmname.nil?
+      show_usage
+      ui.fatal('You must specify a virtual machine name')
+      exit 1
+    end
+
+    vim_connection
+
+    if get_config(:recursive)
+      vms = get_vms(vmname)
+      if vms.length > 1
+        abort "More than one VM with name #{vmname} found:\n" + vms.map { |vm| get_path_to_object(vm) }.join("\n")
+      end
+      abort "VM #{vmname} not found" if vms.length == 0
+      vm = vms[0]
+    else
+      base_folder = find_folder(get_config(:folder))
+
+      vm = find_in_folder(base_folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+    end
+
+    if get_config(:iso)
+      cdrom_obj = vm.config.hardware.device.find { |hw| hw.class == RbVmomi::VIM::VirtualCdrom }
+      machine_conf_spec = RbVmomi::VIM::VirtualMachineConfigSpec(
+        deviceChange: [{
+          operation: :edit,
+          device: RbVmomi::VIM::VirtualCdrom(
+            backing: RbVmomi::VIM::VirtualCdromIsoBackingInfo(
+              fileName: "[#{get_config(:datastore)}] #{get_config(:iso)}"
+            ),
+            key: cdrom_obj.key,
+            controllerKey: cdrom_obj.controllerKey,
+            connectable: RbVmomi::VIM::VirtualDeviceConnectInfo(
+              startConnected: get_config(:on_boot) || false,
+              connected: get_config(:attach) || false,
+              allowGuestControl: true
+            )
+          )
+        }]
+      )
+      vm.ReconfigVM_Task(spec: machine_conf_spec).wait_for_completion
+    elsif get_config(:disconnect)
+      cdrom_obj = vm.config.hardware.device.find { |hw| hw.class == RbVmomi::VIM::VirtualCdrom }
+      machine_conf_spec = RbVmomi::VIM::VirtualMachineConfigSpec(
+        deviceChange: [{
+          operation: :edit,
+          device: RbVmomi::VIM::VirtualCdrom(
+            backing: RbVmomi::VIM::VirtualCdromRemoteAtapiBackingInfo(
+              deviceName: ''),
+            key: cdrom_obj.key,
+            controllerKey: cdrom_obj.controllerKey,
+            connectable: RbVmomi::VIM::VirtualDeviceConnectInfo(
+              startConnected: false,
+              connected: false,
+              allowGuestControl: true
+            )
+          )
+        }]
+      )
+      puts 'attempting to reconfigure the vm'
+      vm.ReconfigVM_Task(spec: machine_conf_spec).wait_for_completion
+    end
+  end
+end

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -368,15 +368,17 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   def wait_for_access(connect_host, connect_port, protocol)
     if protocol == 'winrm'
       load_winrm_deps
+      if get_config(:winrm_transport) == 'ssl' && get_config(:winrm_port) == '5985'
+        config[:winrm_port] = '5986'
+      end
       connect_port = get_config(:winrm_port)
-      print "\n#{ui.color('Waiting for winrm access to become available', :magenta)}"
+      print "\n#{ui.color("Waiting for winrm access to become available on #{connect_host}:#{connect_port}",:magenta)}"
       print('.') until tcp_test_winrm(connect_host, connect_port) do
         sleep 10
         puts('done')
       end
     else
-      print "\n#{ui.color('Waiting for sshd access to become available', :magenta)}"
-      # If FreeSSHd, winsshd etc are available
+      print "\n#{ui.color("Waiting for sshd access to become available on #{connect_host}:#{connect_port}", :magenta)}"
       print('.') until tcp_test_ssh(connect_host, connect_port) do
         sleep 10
         puts('done')
@@ -534,7 +536,9 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       end
     end
 
-    unless get_config(:disable_customization)
+    if get_config(:disable_customization)
+      clone_spec.customization = cust_spec    
+    else
       use_ident = !config[:customization_hostname].nil? || !get_config(:customization_domain).nil? || cust_spec.identity.nil?
 
       if use_ident

data/lib/chef/knife/vsphere_vm_list.rb

@@ -16,19 +16,28 @@ class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
          short: '-r',
          description: 'Recurse into sub-folders'
 
-  def traverse_folders(folder, is_top = false, recurse = false)
-    vms = find_all_in_folder(folder, RbVmomi::VIM::VirtualMachine).select { |v| v.config && !v.config.template }
-    if vms.any?
-      puts "#{ui.color('Folder', :cyan)}: " + (folder.path[3..-1].map { |x| x[1] }.* '/')
-      vms.each { |v|  print_vm(v) }
-    elsif is_top
-      puts "#{ui.color('No VMs', :cyan)}"
+  option :onlyfolders,
+         long: '--only-folders',
+         description: 'List only the folders found',
+         boolean: false
+
+  def traverse_folders(folder, is_top = false, recurse = false, only_folders = false)
+    if only_folders
+      print_folder(folder)
+    else
+      vms = find_all_in_folder(folder, RbVmomi::VIM::VirtualMachine).select { |v| v.config && !v.config.template }
+      if vms.any?
+        print_folder(folder)
+        vms.each { |v| print_vm(v) }
+      elsif is_top
+        puts "#{ui.color('No VMs', :cyan)}"
+      end
     end
 
     return unless recurse
     folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
     folders.each do |child|
-      traverse_folders(child, false, recurse)
+      traverse_folders(child, false, recurse, only_folders)
     end
   end
 
@@ -47,11 +56,16 @@ class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
     puts "\t\t#{ui.color('State:', :magenta)} #{state}"
   end
 
+  def print_folder(folder)
+    puts "#{ui.color('Folder', :cyan)}: " + (folder.path[3..-1].map { |x| x[1] }.* '/')
+  end
+
   def run
     vim_connection
     base_folder = find_folder(get_config(:folder))
-    recurse =  get_config(:recursive)
+    only_folders = get_config(:onlyfolders)
+    recurse = only_folders || get_config(:recursive)
     is_top = true
-    traverse_folders(base_folder, is_top, recurse)
+    traverse_folders(base_folder, is_top, recurse, only_folders)
   end
 end

data/lib/chef/knife/vsphere_vm_markastemplate.rb

@@ -20,7 +20,8 @@ class Chef::Knife::VsphereVmMarkastemplate < Chef::Knife::BaseVsphereCommand
 
   option :folder,
          long: '--folder FOLDER',
-         description: 'The folder which contains the VM'
+         description: 'The folder which contains the VM',
+         default: ''
 
   def run
     $stdout.sync = true

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 description: VMware vSphere Support for Chef's Knife Command
 email: ezra@cpan.org
 executables: []
@@ -77,6 +77,7 @@ files:
 - lib/chef/knife/vsphere_cluster_list.rb
 - lib/chef/knife/vsphere_cpu_ratio.rb
 - lib/chef/knife/vsphere_customization_list.rb
+- lib/chef/knife/vsphere_datastore_file.rb
 - lib/chef/knife/vsphere_datastore_list.rb
 - lib/chef/knife/vsphere_datastore_maxfree.rb
 - lib/chef/knife/vsphere_datastorecluster_list.rb
@@ -88,6 +89,7 @@ files:
 - lib/chef/knife/vsphere_template_list.rb
 - lib/chef/knife/vsphere_vlan_create.rb
 - lib/chef/knife/vsphere_vlan_list.rb
+- lib/chef/knife/vsphere_vm_cdrom.rb
 - lib/chef/knife/vsphere_vm_clone.rb
 - lib/chef/knife/vsphere_vm_config.rb
 - lib/chef/knife/vsphere_vm_delete.rb