chef-provisioning-vsphere 0.5.8 → 0.6.0.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12dda7faea087859dd1c57ca94de5f57075f34ac
-  data.tar.gz: 8ed3e2836949def6569e148c067f4ee427405218
+  metadata.gz: cfce09fb43f3b3cfe3787f91741a81965af267e4
+  data.tar.gz: 95a3fc5f27b5e6bb12b50a6b426072d0720c9ebc
 SHA512:
-  metadata.gz: 2daa6f17429a7bc45099cf006178fd36da7f4dd684d288b67569f91dccbc2b2562271dfb049c209a237b64fc98efbd7127a4b97b2e5e4a542a020a36ebbaca8b
-  data.tar.gz: a7adc29123fade718ff1e960ac89d57c2a46811c11ce95ac32cf75252f6c4b95879a55fcf9e56920423861c737c765260e3db13846de2e298b2a81a2807a84e8
+  metadata.gz: 6dffdc98cfe32f64a2da92eef7e021f52011344567cf83ca82cd34ad211d9535797bc167e6c4aa07e4151cf8e1e263eb15a4c95e1c4cfe98ec86f2d4e9397c44
+  data.tar.gz: 8a748e48ca8fd9d5e8cf189da50f6827cc042b01deff6c72bb36dca3da708f4dfd4a6955a1bf9e114bb731fb4d6c5a1e59e58af9d21ca66f4624fa894095568e

data/README.md

@@ -102,6 +102,13 @@ This will use chef-zero and needs no chef server (only works for ssh). Note that
 - `[:customization_spec][:product_id]` - windows product key
 - `[:customization_spec][:win_time_zone]` - numeric time zone for windows
 
+## Timeout options
+These are settings set at the root of `machine_options`. Chances are the defaults for these settings do not need to be changed:
+
+- `start_timeout` - number of seconds to wait for a machine to be accessible after a restart (default 10 minutes)
+- `create_timeout` - number of seconds to wait for a machine to be accessible after initiating provisioning (default 10 minutes)
+- `ready_timeout` - number of seconds to wait for customization to complete and vmware tools to come on line (default 5 minutes)
+
 ## More config examples
 
 ### Static IP and an additional 50GB disk

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

@@ -259,22 +259,24 @@ module ChefProvisioningVsphere
       # Customization below may change this to a valid ip
       wait_until_ready(action_handler, machine_spec, machine_options, vm)
       
-      # find the ip we actually want
-      # this will be the static ip to assign
-      # or the ip reported back by the vm if using dhcp
-      # it *may* be nil if just cloned
-      vm_ip = ip_to_bootstrap(bootstrap_options, vm)
-      transport = nil
-      unless vm_ip.nil?
-        transport = transport_for(machine_spec, bootstrap_options[:ssh], vm_ip)
-      end
+      if !machine_spec.location['ipaddress'] || !has_ip?(machine_spec.location['ipaddress'], vm)
+        # find the ip we actually want
+        # this will be the static ip to assign
+        # or the ip reported back by the vm if using dhcp
+        # it *may* be nil if just cloned
+        vm_ip = ip_to_bootstrap(bootstrap_options, vm)
+        transport = nil
+        unless vm_ip.nil?
+          transport = transport_for(machine_spec, bootstrap_options[:ssh], vm_ip)
+        end
 
-      unless !transport.nil? && transport.available? && has_ip?(vm_ip, vm)
-        attempt_ip(machine_options, action_handler, vm, machine_spec)
+        unless !transport.nil? && transport.available? && has_ip?(vm_ip, vm)
+          attempt_ip(machine_options, action_handler, vm, machine_spec)
+        end
+        machine_spec.location['ipaddress'] = vm.guest.ipAddress
+        action_handler.report_progress(
+          "IP address obtained: #{machine_spec.location['ipaddress']}")
       end
-      machine_spec.location['ipaddress'] = vm.guest.ipAddress
-      action_handler.report_progress(
-        "IP address obtained: #{machine_spec.location['ipaddress']}")
 
       wait_for_domain(bootstrap_options, vm, machine_spec, action_handler)
 

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

@@ -1,3 +1,3 @@
 module ChefProvisioningVsphere
-  VERSION = '0.5.8'
-end
+  VERSION = '0.6.0.dev.1'
+end

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

@@ -126,7 +126,7 @@ module ChefProvisioningVsphere
       if backing_info.is_a?(RbVmomi::VIM::VirtualEthernetCardDistributedVirtualPortBackingInfo)
         backing_info.port.portgroupKey
       else
-        backing_info.network
+        backing_info.deviceName
       end
     end
 
@@ -208,6 +208,7 @@ module ChefProvisioningVsphere
     end
 
     def backing_info_for(action_handler, network_name)
+      action_handler.report_progress('finding networks...')
       network = find_network(network_name)
       action_handler.report_progress(
         "network: #{network_name} is a #{network.class}")
@@ -296,7 +297,7 @@ module ChefProvisioningVsphere
       entity_array.each do |item|
         case base
         when RbVmomi::VIM::Folder
-          base = base.childEntity.find { |f| f.name == item }
+          base = base.find(item)
         when RbVmomi::VIM::VmwareDistributedVirtualSwitch
           idx = base.summary.portgroupName.find_index(item)
           base = idx.nil? ? nil : base.portgroup[idx]

data/lib/kitchen/driver/vsphere.rb

@@ -7,6 +7,8 @@ module Kitchen
   module Driver
     class Vsphere < Kitchen::Driver::Base
 
+      @@chef_zero_server = false
+
       default_config :machine_options,
         :start_timeout => 600,
         :create_timeout => 600,
@@ -25,16 +27,17 @@ module Kitchen
         }
 
       def create(state)
-        config[:server_name] ||= "kitchen-#{SecureRandom.hex(4)}"
+        state[:vsphere_name] ||= "kitchen-#{SecureRandom.hex(4)}"
         state[:username] = config[:machine_options][:bootstrap_options][:ssh][:user]
         state[:password] = config[:machine_options][:bootstrap_options][:ssh][:password]
-        
-        machine = with_provisioning_driver(config[:server_name]) do | action_handler, driver, machine_spec|
+        config[:server_name] = state[:vsphere_name]
+
+        machine = with_provisioning_driver(state) do | action_handler, driver, machine_spec|
           driver.allocate_machine(action_handler, machine_spec, config[:machine_options])
           driver.ready_machine(action_handler, machine_spec, config[:machine_options])
           state[:server_id] = machine_spec.location['server_id']
           state[:hostname] = machine_spec.location['ipaddress']
-          state[:vsphere_name] = config[:server_name]
+          machine_spec.save(action_handler)
         end
 
         node_dir = File.join(instance.verifier[:test_base_path], "nodes")
@@ -49,13 +52,12 @@ module Kitchen
         File.open(node_file, 'w') do |out|
           out << JSON.pretty_generate(node)
         end
-
       end
 
       def destroy(state)
         return if state[:server_id].nil?
 
-        with_provisioning_driver(state[:vsphere_name]) do | action_handler, driver, machine_spec|
+        with_provisioning_driver(state) do | action_handler, driver, machine_spec|
           machine_spec.location = { 'driver_url' => driver.driver_url,
                         'server_id' => state[:server_id]}
           driver.destroy_machine(action_handler, machine_spec, config[:machine_options])
@@ -69,15 +71,43 @@ module Kitchen
         File.delete(node_file) if File.exist?(node_file)
       end
 
-      def with_provisioning_driver(name, &block)
-        Cheffish.honor_local_mode do
-          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)
-          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)
+      def with_provisioning_driver(state, &block)
+        config[:machine_options][:convergence_options] = {:chef_server => chef_server}
+        machine_spec = Chef::Provisioning.chef_managed_entry_store(chef_server).get(:machine, state[:vsphere_name])
+        if machine_spec.nil?
+          machine_spec = Chef::Provisioning.chef_managed_entry_store(chef_server)
+            .new_entry(:machine, state[:vsphere_name])
+        end
+        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
+
+      def chef_server
+        if !@@chef_zero_server
+          vsphere_mutex.synchronize do
+            if !@@chef_zero_server
+              Chef::Config.local_mode = true
+              Chef::Config.chef_repo_path = Chef::Config.find_chef_repo_path(Dir.pwd)
+              require 'chef/local_mode'
+              Chef::LocalMode.setup_server_connectivity
+              @@chef_zero_server = true
+            end
+          end
+        end
+
+        Cheffish.default_chef_server
+      end
+
+      def vsphere_mutex
+        @@vsphere_mutex ||= begin
+          Kitchen.mutex.synchronize do
+            instance.class.mutexes ||= Hash.new
+            instance.class.mutexes[self.class] = Mutex.new
+          end
+
+          instance.class.mutexes[self.class]
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0.dev.1
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
@@ -131,9 +131,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.4