chef-provisioning-vsphere 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d54830a37d53c9a2d1bdb64ebb6629b301b16695
-  data.tar.gz: b36937d0a2d33f183e7b3e896b14176d599a27c8
+  metadata.gz: 122ef0d030113564796d19efc129ee65e1714dd3
+  data.tar.gz: eaf4d9767af209f6defa4dba89ad740ae9d3bed6
 SHA512:
-  metadata.gz: 2ebfe1f94f677a9b17726ec60d30f4291bb5fe1e0256ffe1e06e5a010be0ff2ee5ab1de8b7b0aff340e5c7d0f51f05b775a2991d52982fa49156cc0422482283
-  data.tar.gz: bd712a3c8c64700f6f5eaffd12ca53194a20076b35f8c1a5dcba7e804103ae749f47fe13e06525b19e60011bb657191052a2d579063e14bcb078d8ad65ace082
+  metadata.gz: 5ed0544f3514340869dcf6c3fd36285399d627af1483c474b10d28ff51f9caebf1020cf08cff87ee344b45a25a9fe3d235eed158d00fa0e9a6d918ec421a873a
+  data.tar.gz: 535e22f53664418ace53f14b6ce726a5d4bab4ed7f71d4194c7ff424b77b8401982540cc8a6658a24b98a04bf24f2d8f37ff5e09f7f95477252aa4bf880a17d7

data/Gemfile

@@ -1,5 +1,5 @@
-# -*- encoding: utf-8 -*-
-source "https://rubygems.org"
-gemspec
-
-gem "chef", "~> 12.3"
+# -*- encoding: utf-8 -*-
+source "https://rubygems.org"
+gemspec
+
+gem "chef", "~> 12.3"

data/README.md

@@ -84,13 +84,13 @@ This will use chef-zero and needs no chef server (only works for ssh). Note that
 - `[:memory_mb]` - number of megabytes to allocate for machine
 - `[:host]` - `{cluster}`/`{host}` to use during provisioning
 - `[:resource_pool]` - `{cluster}`/`{resource pool}` to use during provisioning
-- `[:additional_disk_size_gb]` - an array of numbers, each signifying the number of gigabytes to assign to an additional disk (*his requires a datastore to be specified*)
+- `[:additional_disk_size_gb]` - an array of numbers, each signifying the number of gigabytes to assign to an additional disk (*this requires a datastore to be specified*)
 - `[:ssh][:user]` user to use for ssh/winrm (defaults to root on linux/administrator on windows)
 - `[:ssh][:password]` - password to use for ssh/winrm
 - `[:ssh][:paranoid]` - specifies the strictness of the host key verification checking
 - `[:ssh][:port]` port to use for ssh/winrm (defaults to 22 for ssh or 5985 for winrm)
-- `[:convergence_options][:install_msi_url]` - url to chef client msi to use (defaults to latest) 
-- `[:convergence_options][:install_sh_url]` - the bach script to install chef client on linux (defaults to latest)
+- `[:convergence_options][:install_msi_url]` - url to chef client msi to use (defaults to latest)
+- `[:convergence_options][:install_sh_url]` - the bash script to install chef client on linux (defaults to latest)
 - `[:customization_spec][:ipsettings][:ip]` static ip to assign to machine
 - `[:customization_spec][:ipsettings][:subnetMask]` - subnet to use
 - `[:customization_spec][:ipsettings][:gateway]` - array of possible gateways to use (this will most often be an array of 1)

data/chef-provisioning-vsphere.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |s|
   s.test_files   = s.files.grep(%r{^(test|spec|features)/})
 
   s.add_dependency 'rbvmomi', '~> 1.8.0', '>= 1.8.2'
-  s.add_dependency 'chef-provisioning', '~>1.1'
-  s.add_dependency 'winrm', '~> 1.6'
+  s.add_dependency 'chef-provisioning', '~>2.0', '>= 2.0.1'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rake'

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

@@ -144,7 +144,7 @@ module ChefProvisioningVsphere
             :nicSettingMap => cust_adapter_mapping
           )
         else
-          vsphere_helper.find_customization_spec(cust_options)
+          vsphere_helper.find_customization_spec(options[:customization_spec])
         end
       end
     end

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

@@ -46,7 +46,7 @@ module ChefProvisioningVsphere
       super(driver_url, config)
 
       uri = URI(driver_url)
-      @connect_options = { 
+      @connect_options = {
         provider: 'vsphere',
         host: uri.host,
         port: uri.port,
@@ -131,7 +131,7 @@ module ChefProvisioningVsphere
 
       action_handler.report_progress full_description(
         machine_spec, bootstrap_options)
-      
+
       vm = find_or_create_vm(bootstrap_options, machine_spec, action_handler)
 
       add_machine_spec_location(vm, machine_spec)
@@ -183,10 +183,16 @@ module ChefProvisioningVsphere
       vm
     end
 
-    def full_description(machine_spec, bootstrap_options)
+   def full_description(machine_spec, bootstrap_options)
       description = [ "creating machine #{machine_spec.name} on #{driver_url}" ]
       bootstrap_options.to_hash.each_pair do |key,value|
-        description << "  #{key}: #{value.inspect}"
+        if value.is_a?(Hash) then
+          temp_value = value.clone
+          temp_value[:password] = "*********" if value.has_key?(:password)
+        else
+          temp_value = value
+        end
+        description << "  #{key}: #{temp_value.inspect}"
       end
       description
     end
@@ -258,7 +264,7 @@ module ChefProvisioningVsphere
       # This may just be the ip of a newly cloned machine
       # Customization below may change this to a valid ip
       wait_until_ready(action_handler, machine_spec, machine_options, vm)
-      
+
       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
@@ -303,7 +309,7 @@ module ChefProvisioningVsphere
 
     def attempt_ip(machine_options, action_handler, vm, machine_spec)
       vm_ip = ip_to_bootstrap(machine_options[:bootstrap_options], vm)
-      
+
       wait_for_ip(vm, machine_options, machine_spec, action_handler)
 
       unless has_ip?(vm_ip, vm)
@@ -314,7 +320,7 @@ module ChefProvisioningVsphere
           msg << ' and tools state is '
           msg << vm.guest.toolsRunningStatus
           msg << '. powering up server...'
-          action_handler.report_progress(msg.join)
+          action_handler.report_progress(msg)
           vsphere_helper.start_vm(vm)
         else
           restart_server(action_handler, machine_spec, machine_options)
@@ -325,9 +331,19 @@ module ChefProvisioningVsphere
 
     def wait_for_domain(bootstrap_options, vm, machine_spec, action_handler)
       return unless bootstrap_options[:customization_spec]
-      return unless bootstrap_options[:customization_spec][:domain]
 
-      domain = bootstrap_options[:customization_spec][:domain]
+      domain = if bootstrap_options[:customization_spec].is_a?(String) && is_windows?(vm)
+        spec = vsphere_helper.find_customization_spec(bootstrap_options[:customization_spec])
+        spec.identity.identification.joinDomain
+      elsif bootstrap_options[:customization_spec].is_a?(String) && !is_windows?(vm)
+        spec = vsphere_helper.find_customization_spec(bootstrap_options[:customization_spec])
+        spec.identity.domain
+      else
+        bootstrap_options[:customization_spec][:domain]
+      end
+
+      return unless domain
+
       if is_windows?(vm) && domain != 'local'
         start = Time.now.utc
         trimmed_name = machine_spec.name.byteslice(0,15)
@@ -458,11 +474,13 @@ module ChefProvisioningVsphere
     def has_static_ip(bootstrap_options)
       if bootstrap_options.has_key?(:customization_spec)
         bootstrap_options = bootstrap_options[:customization_spec]
-        if bootstrap_options.has_key?(:ipsettings)
+
+        if bootstrap_options.is_a?(String)
+          spec = vsphere_helper.find_customization_spec(bootstrap_options)
+          return spec.nicSettingMap[0].adapter.ip.is_a?(RbVmomi::VIM::CustomizationFixedIp)
+        elsif bootstrap_options.has_key?(:ipsettings)
           bootstrap_options = bootstrap_options[:ipsettings]
-          if bootstrap_options.has_key?(:ip)
-            return true
-          end
+          return bootstrap_options.has_key?(:ip)
         end
       end
       false
@@ -473,7 +491,7 @@ module ChefProvisioningVsphere
         (machine_options[:start_timeout] || 600) -
           (Time.now.utc - Time.parse(machine_spec.location['started_at']))
       else
-        (machine_options[:create_timeout] || 600) - 
+        (machine_options[:create_timeout] || 600) -
          (Time.now.utc - Time.parse(machine_spec.location['allocated_at']))
       end
     end
@@ -483,7 +501,7 @@ module ChefProvisioningVsphere
         if action_handler.should_perform_actions
           action_handler.report_progress "waiting for #{machine_spec.name} (#{vm.config.instanceUuid} on #{driver_url}) to be ready ..."
           until remaining_wait_time(machine_spec, machine_options) < 0 ||
-            (vm.guest.toolsRunningStatus == "guestToolsRunning" && !vm.guest.ipAddress.nil? && vm.guest.ipAddress.length > 0) do
+            (vm.guest.toolsRunningStatus == "guestToolsRunning" && vm.guest.ipAddress && !vm.guest.ipAddress.empty?) do
             print "."
             sleep 5
           end
@@ -519,12 +537,12 @@ module ChefProvisioningVsphere
       additional_disk_size_gb = bootstrap_options[:additional_disk_size_gb]
       if !additional_disk_size_gb.is_a?(Array)
         additional_disk_size_gb = [additional_disk_size_gb]
-      end        
+      end
 
       additional_disk_size_gb.each do |size|
         size = size.to_i
         next if size == 0
-        if bootstrap_options[:datastore].to_s.empty? 
+        if bootstrap_options[:datastore].to_s.empty?
           raise ':datastore must be specified when adding a disk to a cloned vm'
         end
         task = vm.ReconfigVM_Task(
@@ -546,7 +564,7 @@ module ChefProvisioningVsphere
 
     def vsphere_helper
       @vsphere_helper ||= VsphereHelper.new(
-        connect_options, 
+        connect_options,
         config[:machine_options][:bootstrap_options][:datacenter]
       )
     end
@@ -564,11 +582,11 @@ module ChefProvisioningVsphere
       end
 
       transport = transport_for(
-        machine_spec, 
+        machine_spec,
         machine_options[:bootstrap_options][:ssh]
       )
       strategy = convergence_strategy_for(machine_spec, machine_options)
-      
+
       if machine_spec.location['is_windows']
         Chef::Provisioning::Machine::WindowsMachine.new(
           machine_spec, transport, strategy)
@@ -628,8 +646,8 @@ module ChefProvisioningVsphere
     end
 
     def transport_for(
-      machine_spec, 
-      remoting_options, 
+      machine_spec,
+      remoting_options,
       ip = machine_spec.location['ipaddress']
     )
       if machine_spec.location['is_windows']
@@ -679,9 +697,14 @@ module ChefProvisioningVsphere
 
     def ip_to_bootstrap(bootstrap_options, vm)
       if has_static_ip(bootstrap_options)
-        bootstrap_options[:customization_spec][:ipsettings][:ip]
+        if bootstrap_options[:customization_spec].is_a?(String)
+          spec = vsphere_helper.find_customization_spec(bootstrap_options[:customization_spec])
+          spec.nicSettingMap[0].adapter.ip.ipAddress
+        else
+          bootstrap_options[:customization_spec][:ipsettings][:ip]
+        end
       else
-          vm.guest.ipAddress
+        vm.guest.ipAddress
       end
     end
   end

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

@@ -1,3 +1,3 @@
 module ChefProvisioningVsphere
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

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

@@ -83,8 +83,14 @@ module ChefProvisioningVsphere
 
     def datacenter
       vim # ensure connection is valid
-      @datacenter ||= vim.serviceInstance.find_datacenter(datacenter_name) ||
-        raise("vSphere Datacenter not found [#{datacenter_name}]")
+      @datacenter ||= begin
+        rootFolder = vim.serviceInstance.content.rootFolder
+        dc = rootFolder.childEntity.grep(RbVmomi::VIM::Datacenter).find do |x|
+          x.name == datacenter_name
+        end
+        raise("vSphere Datacenter not found [#{datacenter_name}]") if dc.nil?
+        dc
+      end
     end
 
     def network_adapter_for(operation, network_name, network_label, device_key, backing_info)

data/lib/kitchen/driver/vsphere.rb

@@ -1,104 +1,104 @@
-require 'json'
-require 'kitchen'
-require 'chef/provisioning/vsphere_driver'
-require 'chef/provisioning/machine_spec'
-
-module Kitchen
-  module Driver
-    class Vsphere < Kitchen::Driver::Base
-
-      @@chef_zero_server = false
-
-      default_config :machine_options,
-        :start_timeout => 600,
-        :create_timeout => 600,
-        :stop_timeout => 600,
-        :ready_timeout => 90,
-        :bootstrap_options => {
-          :use_linked_clone => true,
-          :ssh => {
-            :user => 'root',
-            :paranoid => false,
-            :port => 22
-          },
-          :convergence_options => {},
-          :customization_spec => {
-            :domain => 'local'
-          }
-        }
-
-      default_config(:vsphere_name) do |driver|
-        "#{driver.instance.name}-#{SecureRandom.hex(4)}"
-      end
-
-      def create(state)
-        state[:vsphere_name] = config[:vsphere_name] 
-        state[:username] = config[:machine_options][:bootstrap_options][:ssh][:user]
-        state[:password] = config[:machine_options][:bootstrap_options][:ssh][:password]
-        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']
-          machine_spec.save(action_handler)
-        end
-      end
-
-      def destroy(state)
-        return if state[:server_id].nil?
-
-        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])
-        end
-
-        state.delete(:server_id)
-        state.delete(:hostname)
-        state.delete(:vsphere_name)
-      end
-
-      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
-  end
-end
+require 'json'
+require 'kitchen'
+require 'chef/provisioning/vsphere_driver'
+require 'chef/provisioning/machine_spec'
+
+module Kitchen
+  module Driver
+    class Vsphere < Kitchen::Driver::Base
+
+      @@chef_zero_server = false
+
+      default_config :machine_options,
+        :start_timeout => 600,
+        :create_timeout => 600,
+        :stop_timeout => 600,
+        :ready_timeout => 90,
+        :bootstrap_options => {
+          :use_linked_clone => true,
+          :ssh => {
+            :user => 'root',
+            :paranoid => false,
+            :port => 22
+          },
+          :convergence_options => {},
+          :customization_spec => {
+            :domain => 'local'
+          }
+        }
+
+      default_config(:vsphere_name) do |driver|
+        "#{driver.instance.name}-#{SecureRandom.hex(4)}"
+      end
+
+      def create(state)
+        state[:vsphere_name] = config[:vsphere_name]
+        state[:username] = config[:machine_options][:bootstrap_options][:ssh][:user]
+        state[:password] = config[:machine_options][:bootstrap_options][:ssh][:password]
+        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']
+          machine_spec.save(action_handler)
+        end
+      end
+
+      def destroy(state)
+        return if state[:server_id].nil?
+
+        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])
+        end
+
+        state.delete(:server_id)
+        state.delete(:hostname)
+        state.delete(:vsphere_name)
+      end
+
+      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
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
@@ -36,28 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: winrm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '2.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement