vagrant-vsphere 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bde84889640454ab4fc3e756f28c8d1c949c70bf
-  data.tar.gz: 0268d91280e5ce182635227087062b0b53ecddf0
+  metadata.gz: 7747b951188bee2b8908f9273b0b50600a84bc7c
+  data.tar.gz: 2cc6660d48609b56c3e0b413b88f0d9c97c763c4
 SHA512:
-  metadata.gz: 35828ef6c5a0e9f2f76f6d962d2f3108656cd1e303e05cc563686d1c178fd38148e9b2e756f7e4f6fcda032dd63d149f15feb3507f3af0d3fefdc6b5319b3446
-  data.tar.gz: 98e6c963cee7eecb7ecaac8650ee97783b4e050cbbedfb8ad839726149feb42dde3e432c440c735aec2b5482d4fa5b7dc9027a1738d42689a7a0fcccb09e861b
+  metadata.gz: 9f9b21cd04aad4d2af7885f0a4c447016b413b5649706074b9bb3e4d2fc6e9f7ef597d805f848dc4d1d5c1c8fb6fe965e0dc26dbdfbd35d7d3a3c618772217f2
+  data.tar.gz: b22d5a1351afd85c1f6cdb53da5152a5d0d4a70df5c3ccaf5acfb0941d6ab4cd8c8bf27b6158cecea7ee436eab8ea64c4734ecb26b1f6f8559c2624f97b8dee9

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.5.0
+current_version = 1.6.0
 tag = true
 commit = true
 

data/.rubocop_todo.yml

@@ -35,7 +35,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 161
+  Max: 162
 
 # Offense count: 3
 Metrics/PerceivedComplexity:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.6.0 (2016-01-21)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.6.0)
+
+  - Use Vagrant core API instead of waiting for SSH communicator, which should
+    resolve some WinRM connection issues
+    ([mkuzmin:wait-winrm](https://github.com/nsidc/vagrant-vsphere/pull/162)).
+
 ## [1.5.0 (2015-09-08)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.5.0)
 
   - Add support for custom attributes

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.5.0**
+**version: 1.6.0**
 
-vagrant-vsphere (**version: 1.5.0**) is available from
+vagrant-vsphere (**version: 1.6.0**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation

data/lib/vSphere/action.rb

@@ -109,6 +109,7 @@ module VagrantPlugins
             b2.use PowerOn unless env[:result]
           end
           b.use CloseVSphere
+          b.use WaitForCommunicator
           b.use Provision
           b.use SyncedFolders
           b.use SetHostname

data/lib/vSphere/action/clone.rb

@@ -1,14 +1,12 @@
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'
-require 'vSphere/util/machine_helpers'
 
 module VagrantPlugins
   module VSphere
     module Action
       class Clone
         include Util::VimHelpers
-        include Util::MachineHelpers
 
         def initialize(app, _env)
           @app = app
@@ -92,9 +90,6 @@ module VagrantPlugins
 
           machine.id = new_vm.config.uuid
 
-          # wait for SSH to be available
-          wait_for_ssh env
-
           env[:ui].info I18n.t('vsphere.vm_clone_success')
 
           @app.call env

data/lib/vSphere/action/is_running.rb

@@ -1,11 +1,7 @@
-require 'vSphere/util/machine_helpers'
-
 module VagrantPlugins
   module VSphere
     module Action
       class IsRunning
-        include Util::MachineHelpers
-
         def initialize(app, _env)
           @app = app
         end

data/lib/vSphere/action/power_on.rb

@@ -1,7 +1,6 @@
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'
-require 'vSphere/util/machine_helpers'
 require 'vSphere/util/vm_helpers'
 
 module VagrantPlugins
@@ -10,7 +9,6 @@ module VagrantPlugins
       class PowerOn
         include Util::VimHelpers
         include Util::VmHelpers
-        include Util::MachineHelpers
 
         def initialize(app, _env)
           @app = app
@@ -22,9 +20,6 @@ module VagrantPlugins
           env[:ui].info I18n.t('vsphere.power_on_vm')
           power_on_vm(vm)
 
-          # wait for SSH to be available
-          wait_for_ssh env
-
           @app.call env
         end
       end

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '1.5.0'
+    VERSION = '1.6.0'
   end
 end

data/locales/en.yml

@@ -7,7 +7,7 @@ en:
     requesting_sdrs_recommendation: |-
       Calling vSphere RecommendDatastores with StoragePlacementSpec of the following settings:
     vm_clone_success: |-
-      New virtual machine successfully cloned and started
+      New virtual machine successfully cloned
     destroy_vm: |-
       Calling vSphere Destroy
     power_off_vm: |-
@@ -20,10 +20,6 @@ en:
       The VM has not been created
     vm_not_running: |-
       The VM is not running
-    waiting_for_ssh: |-
-      Waiting for SSH to become available...
-    waiting_for_winrm: |-
-      Waiting for WinRM to become available...
 
     errors:
       missing_template: |-

data/spec/spec_helper.rb

@@ -68,6 +68,7 @@ RSpec.configure do |config|
                  hostname: nil,
                  communicator: nil,
                  networks: [[:private_network, { ip: '0.0.0.0' }]],
+                 boot_timeout: 1,
                  graceful_halt_timeout: 0.1),
       validate: []
     )
@@ -76,7 +77,7 @@ RSpec.configure do |config|
                       :provider_config => provider_config,
                       :config => vm_config,
                       :state => double('state', id: nil),
-                      :communicate => double('communicator', :ready? => true),
+                      :communicate => double('communicator', :wait_for_ready => true, :ready? => true),
                       :ssh_info => {},
                       :data_dir => Pathname.new(''),
                       :id => nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -160,7 +160,6 @@ files:
 - lib/vSphere/errors.rb
 - lib/vSphere/plugin.rb
 - lib/vSphere/provider.rb
-- lib/vSphere/util/machine_helpers.rb
 - lib/vSphere/util/vim_helpers.rb
 - lib/vSphere/util/vm_helpers.rb
 - lib/vSphere/version.rb
@@ -197,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: VMWare vSphere provider

data/lib/vSphere/util/machine_helpers.rb

@@ -1,20 +0,0 @@
-module VagrantPlugins
-  module VSphere
-    module Util
-      module MachineHelpers
-        def wait_for_ssh(env)
-          if !env[:machine].config.vm.communicator.nil? && env[:machine].config.vm.communicator == :winrm
-            env[:ui].info(I18n.t('vsphere.waiting_for_winrm'))
-          else
-            env[:ui].info(I18n.t('vsphere.waiting_for_ssh'))
-          end
-
-          loop do
-            break if env[:machine].communicate.ready?
-            sleep 5
-          end
-        end
-      end
-    end
-  end
-end