vagrant-vsphere 0.8.5 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.gitignore +2 -1
- data/Gemfile +1 -1
- data/README.md +7 -5
- data/lib/vSphere/util/machine_helpers.rb +6 -1
- data/lib/vSphere/version.rb +1 -1
- data/locales/en.yml +2 -0
- data/spec/spec_helper.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a02c9f4ac97953016ac3fac92a14e7efbcc5b673
|
4
|
+
data.tar.gz: 038f06bf972ccfcd6692b642b91f3922b8d9a618
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 347b867ae7551d99311daab235e410ff51e372aabdedd5c2e5c83418050e43dee02c4d516d5c91b74e6ae22bd50d1ed8c80f96882ee22bd3c411df4d91b80c06
|
7
|
+
data.tar.gz: 93e5f3aef54aa2f63a861767469500a2b8219edfbd3296bbf42a8dbb447f0554df347dcaf5b7589a7739a6237109b04c99e0bc9058e53751039adf0298558f22
|
data/.gitignore
CHANGED
data/Gemfile
CHANGED
@@ -8,6 +8,6 @@ group :development do
|
|
8
8
|
# Vagrant environment itself using `vagrant plugin`.
|
9
9
|
|
10
10
|
ruby "2.0.0"
|
11
|
-
gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.
|
11
|
+
gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.6.3'
|
12
12
|
|
13
13
|
end
|
data/README.md
CHANGED
@@ -1,20 +1,20 @@
|
|
1
1
|
# Vagrant vSphere Provider
|
2
2
|
|
3
|
-
This is a [Vagrant](http://www.vagrantup.com) 1.
|
3
|
+
This is a [Vagrant](http://www.vagrantup.com) 1.6.3+ plugin that adds a [vSphere](http://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc_50%2Fright-pane.html)
|
4
4
|
provider to Vagrant, allowing Vagrant to control and provision machines using VMware. New machines are created from virtual machines or templates which must be configured prior to using using this provider.
|
5
5
|
|
6
6
|
This provider is built on top of the [RbVmomi](https://github.com/vmware/rbvmomi) Ruby interface to the vSphere API.
|
7
7
|
|
8
8
|
## Requirements
|
9
|
-
* Vagrant 1.
|
9
|
+
* Vagrant 1.6.3+
|
10
10
|
* VMware + vSphere API
|
11
11
|
* Ruby 1.9+
|
12
12
|
* libxml2, libxml2-dev, libxslt, libxslt-dev
|
13
13
|
|
14
14
|
## Current Version
|
15
|
-
**0.
|
15
|
+
**0.9.0**
|
16
16
|
|
17
|
-
vagrant-vsphere (0.
|
17
|
+
vagrant-vsphere (0.9.0) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
|
18
18
|
|
19
19
|
## Installation
|
20
20
|
|
@@ -165,7 +165,9 @@ This is useful if running Vagrant from multiple directories or if multiple machi
|
|
165
165
|
* Use root resource pool when cloning from template [#63: matt-richardson:support-resource-pools-on-vsphere-standard-edition](https://github.com/nsidc/vagrant-vsphere/pull/63)
|
166
166
|
* 0.8.5
|
167
167
|
* fixed synced folders to work with WinRM communicator [#72 10thmagnitude:master](https://github.com/nsidc/vagrant-vsphere/pull/72)
|
168
|
-
|
168
|
+
* 0.9.0
|
169
|
+
* increases Vagrant requirements to 1.6.3+
|
170
|
+
* Supports differentiating between SSH/WinRM communicator [#67 marnovdm:feature/waiting-for-winrm](https://github.com/nsidc/vagrant-vsphere/pull/67)
|
169
171
|
|
170
172
|
|
171
173
|
|
@@ -3,7 +3,12 @@ module VagrantPlugins
|
|
3
3
|
module Util
|
4
4
|
module MachineHelpers
|
5
5
|
def wait_for_ssh(env)
|
6
|
-
env[:
|
6
|
+
if not env[:machine].config.vm.communicator.nil? and env[:machine].config.vm.communicator == :winrm
|
7
|
+
env[:ui].info(I18n.t("vsphere.waiting_for_winrm"))
|
8
|
+
else
|
9
|
+
env[:ui].info(I18n.t("vsphere.waiting_for_ssh"))
|
10
|
+
end
|
11
|
+
|
7
12
|
while true
|
8
13
|
break if env[:machine].communicate.ready?
|
9
14
|
sleep 5
|
data/lib/vSphere/version.rb
CHANGED
data/locales/en.yml
CHANGED
data/spec/spec_helper.rb
CHANGED
@@ -52,7 +52,7 @@ RSpec.configure do |config|
|
|
52
52
|
:proxy_host => nil,
|
53
53
|
:proxy_port => nil)
|
54
54
|
vm_config = double(
|
55
|
-
:vm => double('config_vm', :synced_folders => [], :provisioners => [], :networks => [[:private_network, {:ip => '0.0.0.0'}]]),
|
55
|
+
:vm => double('config_vm', :synced_folders => [], :provisioners => [], :communicator => nil, :networks => [[:private_network, {:ip => '0.0.0.0'}]]),
|
56
56
|
:validate => []
|
57
57
|
)
|
58
58
|
@app = double 'app', :call => true
|