chef-provisioning-vsphere 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ba7fbf37a51f31c3b8b68e89f3a51e34bf4f0d
-  data.tar.gz: 9b9811130753d077b67621f679c6270bab93599f
+  metadata.gz: 289ce4f36eb3464e0dee8507d8dce304be531298
+  data.tar.gz: 8ee5162a4546e66817898e591863afdfae034b3a
 SHA512:
-  metadata.gz: 308c22bf77b75fc8edb36110ebc200cdc1df69efa690ab56290f616323b1b7d19e071e644ae3cb18510457778b6d3afbcfbe6cb3b6502e9cb21a8766176b667a
-  data.tar.gz: dbdac821a238acf564e0902a9c352ab97dfd9a70942986d4c3530a8c51edd1ee4f93a82a8dbff496c4e47f6bddab5962df84153922cdd224dd35952737924615
+  metadata.gz: 8bd7374ef470c24daf2eb2145b6243a93794b6c40a454c9995e75c497dd5f8acdf0d0723259a901c71c42b31a0d2383878bd35a08457192390c45fab7d7ccb1a
+  data.tar.gz: b350176f887d25256b507ba0f66ef38a87a6b856854a471d9c694e305481d59587e9b83a7925d0c4f00b88830e5a4045fcdb13fd21e98b87aff40636c28820d6

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-04-17 14:46:47 -0500 using RuboCop version 0.47.1.
+# on 2017-04-20 16:38:44 -0500 using RuboCop version 0.47.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -36,10 +36,15 @@ Lint/UselessAssignment:
     - 'lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb'
     - 'lib/kitchen/driver/vsphere.rb'
 
-# Offense count: 30
+# Offense count: 31
 Metrics/AbcSize:
   Max: 47
 
+# Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 27
+
 # Offense count: 1
 # Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
@@ -48,19 +53,19 @@ Metrics/BlockNesting:
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 571
+  Max: 599
 
-# Offense count: 6
+# Offense count: 7
 Metrics/CyclomaticComplexity:
   Max: 12
 
-# Offense count: 87
+# Offense count: 89
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 189
 
-# Offense count: 38
+# Offense count: 40
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 62

data/.travis.yml

@@ -5,4 +5,6 @@ branches:
     - master
 rvm:
   - 2.3.2
-script: bundle exec rake style
+script:
+  - bundle exec rake style
+  - bundle exec rake spec

data/CHANGELOG.md

@@ -1,10 +1,25 @@
 # Change Log
 
-## [1.0.0](https://github.com/chef-partners/chef-provisioning-vsphere/tree/1.0.0) (2017-04-17)
-[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v0.8.1...1.0.0)
+## [1.1.0](https://github.com/chef-partners/chef-provisioning-vsphere/tree/1.1.0) (2017-04-20)
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v1.0.0...1.1.0)
+
+**Closed issues:**
+
+- Skip bootstrap after provisioning [\#6](https://github.com/chef-partners/chef-provisioning-vsphere/issues/6)
+
+**Merged pull requests:**
+
+- document reqd fields for sysprep [\#11](https://github.com/chef-partners/chef-provisioning-vsphere/pull/11) ([nealbrown](https://github.com/nealbrown))
+- Updated some depenant gems [\#10](https://github.com/chef-partners/chef-provisioning-vsphere/pull/10) ([jjasghar](https://github.com/jjasghar))
+- Metalseargolid feature/ipv4 bootstrap [\#8](https://github.com/chef-partners/chef-provisioning-vsphere/pull/8) ([jjasghar](https://github.com/jjasghar))
+- Add proxy support [\#7](https://github.com/chef-partners/chef-provisioning-vsphere/pull/7) ([jjasghar](https://github.com/jjasghar))
+
+## [v1.0.0](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v1.0.0) (2017-04-17)
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v0.8.1...v1.0.0)
 
 **Merged pull requests:**
 
+- v1.0.0 release [\#4](https://github.com/chef-partners/chef-provisioning-vsphere/pull/4) ([jjasghar](https://github.com/jjasghar))
 - Added links to the README [\#3](https://github.com/chef-partners/chef-provisioning-vsphere/pull/3) ([jjasghar](https://github.com/jjasghar))
 - Cleanup for new release [\#2](https://github.com/chef-partners/chef-provisioning-vsphere/pull/2) ([jjasghar](https://github.com/jjasghar))
 - ensure machine\_options and configs are symbolised for chef13 [\#1](https://github.com/chef-partners/chef-provisioning-vsphere/pull/1) ([jjlimepoint](https://github.com/jjlimepoint))

data/README.md

@@ -87,6 +87,8 @@ This will use chef-zero and needs no chef server (only works for ssh). Note that
 - `[: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 (*this requires a datastore to be specified*)
+- `[: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)
 - `[:ssh][:password]` - password to use for ssh/winrm
 - `[:ssh][:paranoid]` - specifies the strictness of the host key verification checking
@@ -149,6 +151,7 @@ with_machine_options :bootstrap_options => {
 ```
 
 ### Domain joined windows machine
+NOTE: customization_spec `org_name` and `product_id` are required for sysprep Windows machines.
 
 ```ruby
 with_machine_options :bootstrap_options => {

data/chef-provisioning-vsphere.gemspec

@@ -21,11 +21,17 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files -z`.split("\x0")
   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', '~>2.0', '>= 2.0.1'
+  s.add_dependency 'rbvmomi', '~> 1.10'
+  s.add_dependency 'chef-provisioning', '~> 2.0'
   s.add_dependency 'github_changelog_generator'
+  s.add_dependency 'chef', '~> 12'
+  s.add_dependency 'cheffish', '~> 4'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'chefstyle'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency 'pry-stack_explorer'
+  s.add_development_dependency 'rb-readline'
 end

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

@@ -730,8 +730,39 @@ module ChefProvisioningVsphere
           bootstrap_options[:customization_spec][:ipsettings][:ip]
         end
       else
+        if use_ipv4_during_bootstrap?(bootstrap_options)
+          wait_for_ipv4(bootstrap_ip_timeout(bootstrap_options), vm)
+        end
         vm.guest.ipAddress
       end
     end
+
+    def use_ipv4_during_bootstrap?(bootstrap_options)
+      if bootstrap_options.key?(:bootstrap_ipv4)
+        return bootstrap_options[:bootstrap_ipv4] == true
+      end
+      false
+    end
+
+    def bootstrap_ip_timeout(bootstrap_options)
+      if bootstrap_options.key?(:ipv4_timeout)
+        return bootstrap_options[:ipv4_timeout].to_i
+      end
+      30
+    end
+
+    def wait_for_ipv4(timeout, vm)
+      sleep_time = 5
+      print 'Waiting for ipv4 address.'
+      tries = 0
+      max_tries = timeout > sleep_time ? timeout / sleep_time : 1
+      while (vm.guest.ipAddress.nil? || !IPAddr.new(vm.guest.ipAddress).ipv4?) && (tries += 1) <= max_tries
+        print '.'
+        sleep sleep_time
+      end
+      raise 'Timed out waiting for ipv4 address!' if tries > max_tries && !IPAddr.new(vm.guest.ipAddress).ipv4?
+      puts 'Found ipv4 address!'
+      true
+    end
   end
 end

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

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ChefProvisioningVsphere
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'
 end

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

@@ -1,11 +1,18 @@
 # frozen_string_literal: true
 require 'rbvmomi'
+require 'uri'
+require 'net/http'
 
 module ChefProvisioningVsphere
   class VsphereHelper
     $guest_op_managers = {} unless $guest_op_managers
 
     def initialize(connect_options, datacenter_name)
+      http = Net::HTTP.new(connect_options[:host], connect_options[:port])
+      if http.proxy?
+        connect_options[:proxyHost] = http.proxy_address
+        connect_options[:proxyPort] = http.proxy_port
+      end
       @connect_options = connect_options
       @datacenter_name = datacenter_name
     end

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

@@ -4,7 +4,7 @@ require 'uri'
 module URI
   class VsphereUrl < Generic
     DEFAULT_PORT = 443
-    DEFAULT_PATH = '/sdk'.freeze
+    DEFAULT_PATH = '/sdk'
 
     def self.from_config(options)
       parts = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - CenturyLink Cloud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
@@ -17,20 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: chef-provisioning
   requirement: !ruby/object:Gem::Requirement
@@ -38,9 +32,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,9 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +53,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+- !ruby/object:Gem::Dependency
+  name: cheffish
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +123,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provisioner for creating vSphere VM instances in Chef Provisioning.
 email: jj@chef.io
 executables: []