knife-vsphere 1.2.17 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4edadeeb4d877edbc8f0ae9e363bb4c1169ed8a6
-  data.tar.gz: 802b91902e2b0bdbae8dfc25645aaa5a701638bc
+  metadata.gz: 1d94e79affa56d7c9ac20ff54a800e882729a428
+  data.tar.gz: 02e05a982fde906a602ed5f5033c20f259b9db9a
 SHA512:
-  metadata.gz: b0d2e5061e270a70aaf3e06ad0285b9ee83f5bad77366567ec5a23e52cbbaac68a9aaade50d88370dd98bc9f18cea6c77fdd360e55e358692e172ee8be2d983c
-  data.tar.gz: e1ea0b4bb5710b40c28b96410f25731eb9f2f0b5561725dea79b7e8b8031d7e19ee81162b7b1a28c837ffb1c2bc2ef150bcbd663b1dc311755895e59c78378bd
+  metadata.gz: f674ccb248127469ec5bc4e26f9410a08602180ee205280b68ef500f8da7ef296f665f133f5ca230f051fb74948e28e6d1697a94acb0c79a676111681b074eb2
+  data.tar.gz: 827d76a2f790947f0123a26d57703620eb9c477b37ff927be06722a4edb6ede2f93a470d2044af33a2c735357ff7a1d589815e2cbfb30572cf702e1d87e11259

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -224,6 +224,12 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
          proc: proc { |d| Chef::Config[:knife][:distro] = d },
          default: 'chef-full'
 
+  option :tags,
+         long: '--tags TAGS',
+         description: 'Comma separated list of tags to apply to the node',
+         proc: ->(tags) { tags.split(/[\s,]+/) },
+         default: []
+
   option :template_file,
          long: '--template-file TEMPLATE',
          description: 'Full path to location of template to use'
@@ -629,7 +635,9 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       hostname = config[:customization_hostname] || config[:vmname]
 
       if windows?(src_config)
-        # TODO: This is just copying itself onto itself, isn't it?
+        # We should get here with the customizations set, either by a plugin or a --cspec
+        fatal_exit 'Windows clones need a customization identity. Try passing a --cspec or making a --cplugin' if cust_spec.identity.props.empty?
+
         identification = RbVmomi::VIM.CustomizationIdentification(
           joinWorkgroup: cust_spec.identity.identification.joinWorkgroup
         )
@@ -774,6 +782,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     # may be needed for vpc mode
     bootstrap.config[:no_host_key_verify] = get_config(:no_host_key_verify)
     bootstrap.config[:node_ssl_verify_mode] = get_config(:node_ssl_verify_mode)
+    bootstrap.config[:tags] = get_config(:tags)
     bootstrap
   end
 

data/lib/chef/knife/vsphere_vm_network_set.rb

@@ -0,0 +1,46 @@
+#
+# Author:: Owen Groves (<omgroves@gmail.com>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+
+# Changes network on a certain VM
+class Chef::Knife::VsphereVmNetworkSet < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere vm network set VMNAME NETWORKNAME'
+
+  common_options
+
+  option :nic,
+    long: '--nic INTEGER',
+    description: 'Network interface to use when multiple NICs are present on the VM. (0,1..)',
+    default: 0
+
+  def run
+    $stdout.sync = true
+    vmname = @name_args[0]
+    networkname = @name_args[1]
+    if vmname.nil?
+      show_usage
+      fatal_exit('You must specify a virtual machine name')
+    end
+    if networkname.nil?
+      show_usage
+      fatal_exit('You must specify a network name')
+    end
+
+    network = find_network(networkname)
+    vm = get_vm(vmname) || abort('VM not found')
+    nic = vm.config.hardware.device.each.grep(RbVmomi::VIM::VirtualEthernetCard)[Integer(get_config(:nic))]
+    if network.is_a? RbVmomi::VIM::DistributedVirtualPortgroup
+      port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(switchUuid: network.config.distributedVirtualSwitch.uuid, portgroupKey: network.key)
+      nic.backing = RbVmomi::VIM.VirtualEthernetCardDistributedVirtualPortBackingInfo(port: port)
+    elsif network.is_a? RbVmomi::VIM::Network
+      nic.backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(deviceName: network.name)
+    else
+      fatal_exit('Network type not recognized')
+    end
+    change_spec = RbVmomi::VIM.VirtualMachineConfigSpec(deviceChange: [RbVmomi::VIM.VirtualDeviceConfigSpec(device: nic, operation: 'edit')])
+    vm.ReconfigVM_Task(spec: change_spec).wait_for_completion
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.17'
+  VERSION = '1.2.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.17
+  version: 1.2.18
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize
@@ -159,6 +159,7 @@ files:
 - lib/chef/knife/vsphere_vm_migrate.rb
 - lib/chef/knife/vsphere_vm_move.rb
 - lib/chef/knife/vsphere_vm_net.rb
+- lib/chef/knife/vsphere_vm_network_set.rb
 - lib/chef/knife/vsphere_vm_property_get.rb
 - lib/chef/knife/vsphere_vm_property_set.rb
 - lib/chef/knife/vsphere_vm_query.rb
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife