chef-provisioning-vsphere 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9beead24ca50feddc1b634a8d2f8a5c43936c7c2
-  data.tar.gz: 41c0ef964853c87cee814f127cc446b4ac383bd6
+  metadata.gz: 9429c5a2889eb0b8c3a74c2aa968e6134d6933df
+  data.tar.gz: e48b0fe64f042425825347c5408fbf33bcdd7fea
 SHA512:
-  metadata.gz: adc8fd6c36acc6cbcdada4c027290049ebc623334f1eeeb7f92a2fc4b6615b9f1f25f8880ab97559d9ad2da09c9b4ef73c34758c12f25d90f14d7689f700912d
-  data.tar.gz: dc0a7bfae64f5d89262b77d187304b81c709818e83e74d8d178c1fe5ab7b23d7233cf81dab9cc3457da9e364292b7e53eafbc48c5d88219466f40f064b4550cf
+  metadata.gz: 7daa42c1d264122430a212d5b2433f8ebc2e67b2e043853af254d8f9d3d6489d14d3ecb9d5b0303ce99bb6c260c2d29168e9ebd06661f7ec474f9e5b992d576b
+  data.tar.gz: bfffe594fc7914b88753a64f2bf527d6877fbe2e7ea92c100c91368c05523f80c5f69e8013a7a20b7e85920cb7549c678229ead358dab5185b8255b2a79cef77

data/lib/chef/provisioning/vsphere_driver/driver.rb

@@ -110,6 +110,8 @@ module ChefProvisioningVsphere
     #           -- vm_folder: name of the vSphere folder containing the VM
     #
     def allocate_machine(action_handler, machine_spec, machine_options)
+      merge_options! machine_options
+
       if machine_spec.location
         Chef::Log.warn(
           "Checking to see if #{machine_spec.location} has been created...")
@@ -142,6 +144,13 @@ module ChefProvisioningVsphere
       vm
     end
 
+    def merge_options!(machine_options)
+      @config = Cheffish::MergedConfig.new(
+        { machine_options: machine_options },
+        @config
+      )
+    end
+
     def add_machine_spec_location(vm, machine_spec)
       machine_spec.location = {
         'driver_url' => driver_url,
@@ -188,6 +197,8 @@ module ChefProvisioningVsphere
     end
 
     def ready_machine(action_handler, machine_spec, machine_options)
+      merge_options! machine_options
+
       vm = start_machine(action_handler, machine_spec, machine_options)
       if vm.nil?
         raise "Machine #{machine_spec.name} does not have a server "\
@@ -350,10 +361,12 @@ module ChefProvisioningVsphere
 
     # Connect to machine without acquiring it
     def connect_to_machine(machine_spec, machine_options)
+      merge_options! machine_options
       machine_for(machine_spec, machine_options)
     end
 
     def destroy_machine(action_handler, machine_spec, machine_options)
+      merge_options! machine_options
       vm = vm_for(machine_spec)
       if vm
         action_handler.perform_action "Delete VM [#{vm.parent.name}/#{vm.name}]" do
@@ -372,6 +385,7 @@ module ChefProvisioningVsphere
     end
 
     def stop_machine(action_handler, machine_spec, machine_options)
+      merge_options! machine_options
       vm = vm_for(machine_spec)
       if vm
         action_handler.perform_action "Shutdown guest OS and power off VM [#{vm.parent.name}/#{vm.name}]" do
@@ -381,6 +395,7 @@ module ChefProvisioningVsphere
     end
 
     def start_machine(action_handler, machine_spec, machine_options)
+      merge_options! machine_options
       vm = vm_for(machine_spec)
       if vm
         action_handler.perform_action "Power on VM [#{vm.parent.name}/#{vm.name}]" do
@@ -519,15 +534,21 @@ module ChefProvisioningVsphere
       require 'chef/provisioning/convergence_strategy/install_msi'
       require 'chef/provisioning/convergence_strategy/install_cached'
       require 'chef/provisioning/convergence_strategy/no_converge'
-      # Defaults
+
+      mopts = machine_options[:convergence_options].to_hash.dup
+      mopts[:chef_server] = mopts[:chef_server].to_hash.dup if mopts[:chef_server]
+
       if !machine_spec.location
-        return Chef::Provisioning::ConvergenceStrategy::NoConverge.new(machine_options[:convergence_options], config)
+        return Chef::Provisioning::ConvergenceStrategy::NoConverge.new(
+          mopts, config)
       end
 
       if machine_spec.location['is_windows']
-        Chef::Provisioning::ConvergenceStrategy::InstallMsi.new(machine_options[:convergence_options], config)
+        Chef::Provisioning::ConvergenceStrategy::InstallMsi.new(
+          mopts, config)
       else
-        Chef::Provisioning::ConvergenceStrategy::InstallCached.new(machine_options[:convergence_options], config)
+        Chef::Provisioning::ConvergenceStrategy::InstallCached.new(
+          mopts, config)
       end
     end
 

data/lib/chef/provisioning/vsphere_driver/version.rb

@@ -1,3 +1,3 @@
 module ChefProvisioningVsphere
-  VERSION = '0.5.1'
+  VERSION = '0.5.3'
 end

data/lib/kitchen/driver/vsphere.rb

@@ -74,12 +74,12 @@ module Kitchen
           chef_server = Cheffish.default_chef_server
           config[:machine_options][:convergence_options] = {:chef_server => chef_server}
           machine_spec = Chef::Provisioning.chef_managed_entry_store(chef_server).new_entry(:machine, name)
-          driver = Chef::Provisioning.driver_for_url("vsphere://#{config[:driver_options][:host]}", config)
+          url = URI::VsphereUrl.from_config(@config[:driver_options]).to_s
+          driver = Chef::Provisioning.driver_for_url(url, config)
           action_handler = Chef::Provisioning::ActionHandler.new
           block.call(action_handler, driver, machine_spec)
         end
       end
-
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - CenturyLink Cloud