vagrant-vsphere 1.11.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18d24bc77ed74d9653df37d88dd8f86f5b7330d
-  data.tar.gz: 21c8bd222a808a4cfa0885a5a319be806d4612e3
+  metadata.gz: 33c983107b8df23738c00d4aea0222fb30658c44
+  data.tar.gz: 25a77163f89f2ae0955a90bdc5cf56448c2a1f97
 SHA512:
-  metadata.gz: 3f754461b77ae977825e5333be117af21babb85872472330e39d9b8049077dce0a22efbd1e0cced27a00e22f7a56baa9cf497a799641a3c5eb66638b06998ed0
-  data.tar.gz: 8d3481366b6e28f2678310ce9a20d6d70a33c40bfe6b74023ec1764c14eb7f8c41b872958aafec2a7a918cd608b48ec89b1afdf6f1502db7f44a0c20d335580f
+  metadata.gz: 131a0aec11980da13868f349ea9d909c6215a5f5039465a3a79b964fb28e512497b84a981d225d7292e8f42d7bb541d34108543c484a9835e0d651d240a40e1e
+  data.tar.gz: 3cb13e789acc3b185a9b6563736128d29df961bcdce984dffea92a83883ec5477ad3d6b6450598c353a5e3f564b1678dd812347be5c2e90a95f6a189898a6a7c

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.11.1
+current_version = 1.12.0
 tag = true
 commit = true
 

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [1.12.0 (2017-03-07)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.12.0)
+
+  - Make `wait_for_sysprep` functionality configurable (see README.md for
+    details). Defaults to `false` to resolve
+    #222. ([nsidc:make-sysprep-configurable](https://github.com/nsidc/vagrant-vsphere/pull/235))
+  - Fix issue (#231) where finding no adapters while waiting for the IP address
+    to be ready broke the `up`
+    process. ([nsidc:fix-filter-ssh](https://github.com/nsidc/vagrant-vsphere/pull/234))
+  - Fix installation of vagrant-vsphere under Vagrant
+    1.9.2. ([nsidc:fix-install-with-1.9.2](https://github.com/nsidc/vagrant-vsphere/pull/233))
+
 ## [1.11.1 (2017-02-27)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.11.1)
   - Fix 'real_nic_ip' filter logic bug
     ([vagrant-vsphere:fix_ssh_ip_selection](https://github.com/nsidc/vagrant-vsphere/pull/229))

data/README.md

@@ -19,9 +19,9 @@ This provider is built on top of the
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**version: 1.11.1**
+**version: 1.12.0**
 
-vagrant-vsphere (**version: 1.11.1**) is available from
+vagrant-vsphere (**version: 1.12.0**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
@@ -149,8 +149,11 @@ This provider has the following settings, all are required unless noted:
   for a target VM to be retrieved from the list of vm adapters on the host and filtered for a single legitimate
   adapter with a defined interface.   An error will be raised if this filter is enabled and multiple valid
   adapters exist on a host.
-* `ip_address_timeout` _ _Optional_ Maximum number of seconds to wait while an
+* `ip_address_timeout` - _Optional_ Maximum number of seconds to wait while an
   IP address is obtained
+* `wait_for_sysprep` - _Optional_ Boolean. Enable waiting for Windows machines to reboot
+  during the sysprep process
+  ([#199](https://github.com/nsidc/vagrant-vsphere/pull/199)). Defaults to `false`.
 
 ### Cloning from a VM rather than a template
 

data/lib/vSphere/action/clone.rb

@@ -106,7 +106,7 @@ module VagrantPlugins
 
           machine.id = new_vm.config.uuid
 
-          wait_for_sysprep(env, new_vm, connection, 600, 10) if machine.config.vm.guest.eql?(:windows)
+          wait_for_sysprep(env, new_vm, connection, 600, 10) if config.wait_for_sysprep && machine.config.vm.guest.eql?(:windows)
 
           env[:ui].info I18n.t('vsphere.vm_clone_success')
 

data/lib/vSphere/action/get_ssh_info.rb

@@ -24,6 +24,7 @@ module VagrantPlugins
           interfaces = vm.guest.net.select { |g| g.deviceConfigId > 0 }
           ip_addresses = interfaces.map { |i| i.ipConfig.ipAddress.select { |a| a.state == 'preferred' } }.flatten
 
+          return nil if ip_addresses.empty?
           fail Errors::VSphereError.new, :'multiple_interface_with_real_nic_ip_set' if ip_addresses.size > 1
           ip_addresses.first.ipAddress
         end

data/lib/vSphere/config.rb

@@ -30,17 +30,20 @@ module VagrantPlugins
       attr_accessor :extra_config
       attr_accessor :real_nic_ip
       attr_accessor :notes
+      attr_accessor :wait_for_sysprep
 
       attr_reader :custom_attributes
 
       def initialize
         @ip_address_timeout = UNSET_VALUE
+        @wait_for_sysprep = UNSET_VALUE
         @custom_attributes = {}
         @extra_config = {}
       end
 
       def finalize!
         @ip_address_timeout = 240 if @ip_address_timeout == UNSET_VALUE
+        @wait_for_sysprep = false if @wait_for_sysprep == UNSET_VALUE
       end
 
       def custom_attribute(key, value)

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '1.11.1'
+    VERSION = '1.12.0'
   end
 end

data/spec/get_ssh_info_spec.rb

@@ -116,6 +116,15 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
         expect(@env[:machine_ssh_info][:host]).to eq IP_ADDRESS
       end
 
+      context 'when the VM networking is uninitialized' do
+        before do
+          allow(@vm.guest).to receive(:net) { [] }
+        end
+        it 'should set the ssh info to nil if no valid adapters are present' do
+          call
+          expect(@env[:machine_ssh_info]).to eq nil
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -66,7 +66,8 @@ RSpec.configure do |config|
         notes: nil,
         extra_config: {},
         ip_address_timeout: 1,
-        real_nic_ip: false)
+        real_nic_ip: false,
+        wait_for_sysprep: false)
     vm_config = double(
       vm: double('config_vm',
                  box: nil,

data/vSphere.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   # force the use of at least rbvmomi 1.8.2 to work around concurrency errors:
   # https://github.com/nsidc/vagrant-vsphere/issues/139
   s.add_dependency 'rbvmomi', '>=1.8.2', '<2.0.0'
-  s.add_dependency 'i18n', '>= 0.6.4', '< 0.8.0'
+  s.add_dependency 'i18n', '>=0.6.4', '<=0.8.0'
 
   s.add_development_dependency 'rake', '11.1.2' # pinned to accommodate rubocop 0.32.1
   s.add_development_dependency 'rspec-core'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -51,7 +51,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.4
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
@@ -61,7 +61,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.4
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency