chef-provisioning-vsphere 2.0.10 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ca3d2606974b66b820aa053f32e8aa3e6804b92
-  data.tar.gz: add6bbf1fd61a3b887f5880131bec8a2d109d3e1
+  metadata.gz: 1250ea80100fd698d506ffd6f006dc479c66d1e1
+  data.tar.gz: a5fcb5cea33734d3ade4eff3ed7cd0fe4baa80af
 SHA512:
-  metadata.gz: 530c84cad6a830a35f8909400cfe4d09e07d796071b016fd3a79570f8fa1031a5844dbd26183b8c11b0c453cd5adfe19dd3df7af7eb3d28eb43c0d9b38180cfe
-  data.tar.gz: 69ab9ad90c70fa67552b710fc5f0aae696a1a30887837223ac0f7281f9351e4901bc01f60889d5810d2440f260697bb885449b6c2fdd024ec98921f4a268da0c
+  metadata.gz: cbee2f3e9c9bf33d412b7fc247ee1c08d755570f6f07bbbdf10dd0cd34dd720f126eef620a2366bb0964e04e4d67e42d27106fb721757012177fbe5db3ac026e
+  data.tar.gz: a41a2f406b599ccd0500b69ade08d223e329007722e583ad95842704a06ae63b872ed8f7e1ec323921816f2095981879ad2824f603df00f642505835e07ce8e7

data/.rubocop_todo.yml

@@ -52,7 +52,7 @@ Metrics/BlockNesting:
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 638
+  Max: 643
 
 # Offense count: 11
 Metrics/CyclomaticComplexity:

data/CHANGELOG.md

@@ -1,7 +1,22 @@
 # Change Log
 
-## [2.0.10](https://github.com/chef-partners/chef-provisioning-vsphere/tree/2.0.10) (2017-10-31)
-[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.9...2.0.10)
+## [v2.1.0](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.1.0)
+
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.10...v2.1.0)
+
+**Closed issues:**
+
+- Setting network\_name disconnects all devices on OSX [\#62](https://github.com/chef-partners/chef-provisioning-vsphere/issues/62)
+- IPv6 address returned by VM can cause failures [\#52](https://github.com/chef-partners/chef-provisioning-vsphere/issues/52)
+
+**Merged pull requests:**
+
+- Handle IPv6 address returned by VM [\#81](https://github.com/chef-partners/chef-provisioning-vsphere/pull/81) ([jzinn](https://github.com/jzinn))
+- fixed bootstrap ready timeout call [\#73](https://github.com/chef-partners/chef-provisioning-vsphere/pull/73) ([tuccimon](https://github.com/tuccimon))
+- add initial\_iso\_image to support deployment from custom iso images [\#49](https://github.com/chef-partners/chef-provisioning-vsphere/pull/49) ([jjlimepoint](https://github.com/jjlimepoint))
+
+## [v2.0.10](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.0.10) (2017-10-31)
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.0.9...v2.0.10)
 
 **Closed issues:**
 
@@ -257,4 +272,4 @@
 ## [v0.1.3](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v0.1.3) (2014-05-09)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -17,7 +17,7 @@ A vCenter and valid login credentials.
 
 ### VM Template
 
-A VM template capable of installing Chef 11.8 or newer. This can be either windows or linux flavored.
+A VM template capable of installing Chef 11.8 or newer. This can be either windows or linux flavored. Both IPv4 and IPv6 are supported.
 
 ### A provisioning node (can be local)
 
@@ -90,6 +90,7 @@ This will use chef-zero and needs no chef server (only works for ssh). Note that
 - `[:resource_pool]` - `{cluster}`/`{resource pool}` to use during provisioning 
 (for single-host setups, use `{vsphere_ip / vsphere_hostname}`/`{resource pool}`)
 - `[: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*)
+- `[:initial_iso_file]` - an iso file to mount at boot.  This is useful for custom OS installations.  In the format of `[datastore] filename.iso`
 - `[:bootstrap_ipv4]` - `true` / `false`, set to `true` to wait for an IPv4 address to become available before bootstrapping.
 - `[:ipv4_timeout]` - use with `[:bootstrap_ipv4]`, set the time in seconds to wait before an IPv4 address is received (defaults to 30)
 - `[:ssh][:user]` user to use for ssh/winrm (defaults to root on linux/administrator on windows)

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

@@ -710,6 +710,28 @@ module ChefProvisioningVsphere
         task.wait_for_completion
       end
 
+      if bootstrap_options[:initial_iso_image]
+        d_obj = vm.config.hardware.device.select {|hw| hw.class == RbVmomi::VIM::VirtualCdrom}.first
+        backing = RbVmomi::VIM::VirtualCdromIsoBackingInfo(fileName: bootstrap_options[:initial_iso_image])
+        task = vm.ReconfigVM_Task(
+          spec: RbVmomi::VIM.VirtualMachineConfigSpec(
+            deviceChange: [
+              operation: :edit,
+              device: RbVmomi::VIM::VirtualCdrom(
+                backing: backing,
+                key: d_obj.key,
+                controllerKey: d_obj.controllerKey,
+                connectable: RbVmomi::VIM::VirtualDeviceConnectInfo(
+                  startConnected: true,
+                  connected: true,
+                  allowGuestControl: true)
+                )
+              ]
+            )
+          )
+          task.wait_for_completion
+      end
+
       vm
     end
 
@@ -847,8 +869,13 @@ module ChefProvisioningVsphere
       else
         winrm_options.merge!(options[:winrm_opts])
       end
-      endpoint = "http#{winrm_transport == :ssl ? 's' : ''}://"\
-                 "#{host}:#{port}/wsman"
+      scheme = winrm_transport == :ssl ? 'https' : 'http'
+      endpoint = URI::Generic.build(
+        scheme: scheme,
+        host: host,
+        port: port,
+        path: '/wsman'
+      ).to_s
 
       Chef::Provisioning::Transport::WinRM.new(
         endpoint,
@@ -890,7 +917,7 @@ module ChefProvisioningVsphere
           ## Check if true available
           vm_ip = bootstrap_options[:customization_spec][:ipsettings][:ip] unless vm_helper.ip?
           nb_attempts = 0
-          until @vm_helper.open_port?(vm_ip, @vm_helper.port, 1) || nb_attempts > bootstrap_options[:ready_timeout]
+          until @vm_helper.open_port?(vm_ip, @vm_helper.port, 1) || (nb_attempts > (bootstrap_options[:ready_timeout] || 90))
             print '.'
             nb_attempts += 1
           end

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

@@ -3,5 +3,5 @@
 # Provisions machines in vSphere.
 module ChefProvisioningVsphere
   # The version of this awesome Gem. BOOM.
-  VERSION = '2.0.10'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.1.0
 platform: ruby
 authors:
 - CenturyLink Cloud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef