vagrant-vsphere 0.7.2 → 0.8.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/README.md +7 -3
- data/lib/vSphere/action/connect_vsphere.rb +4 -1
- data/lib/vSphere/config.rb +2 -0
- data/lib/vSphere/version.rb +1 -1
- data/spec/spec_helper.rb +4 -2
- 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: 46f7dde63745fe9fab109a934ba3603530e5a59b
|
4
|
+
data.tar.gz: f2758bade95dd3ffb6c2489c1bc701eecaf8781e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 36c0627f6ee870b45af40bef847c1e2e0f025b1641a00d7cdf9e2591a3350e916a14826f63f8af01b4fec593f268a08fd273d7b64280f32316cdfe4ba08b97ef
|
7
|
+
data.tar.gz: 98cd98d0de9340e68dc13c5b4e58224a09561a6ecfbcf490f919637543dd11642da6b5de72f36b4ee0b4517f0fbe69d63dc978782ab4d31c236628d63363c9ee
|
data/README.md
CHANGED
@@ -12,9 +12,9 @@ This provider is built on top of the [RbVmomi](https://github.com/vmware/rbvmomi
|
|
12
12
|
* libxml2, libxml2-dev, libxslt, libxslt-dev
|
13
13
|
|
14
14
|
## Current Version
|
15
|
-
**0.
|
15
|
+
**0.8.0**
|
16
16
|
|
17
|
-
vagrant-vsphere (0.
|
17
|
+
vagrant-vsphere (0.8.0) is available from [RubyGems.org](https://rubygems.org/)
|
18
18
|
|
19
19
|
## Installation
|
20
20
|
|
@@ -86,7 +86,7 @@ This provider has the following settings, all are required unless noted:
|
|
86
86
|
|
87
87
|
* `host` - IP or name for the vSphere API
|
88
88
|
* `insecure` - _Optional_ verify SSL certificate from the host
|
89
|
-
* `user
|
89
|
+
* `user` - user name for connecting to vSphere
|
90
90
|
* `password` - password for connecting to vSphere
|
91
91
|
* `data_center_name` - _Optional_ datacenter containing the computed resource, the template and where the new VM will be created, if not specified the first datacenter found will be used
|
92
92
|
* `compute_resource_name` - _Required if cloning from template_ the name of the host containing the resource pool for the new VM
|
@@ -97,6 +97,8 @@ This provider has the following settings, all are required unless noted:
|
|
97
97
|
* `customization_spec_name` - _Optional_ customization spec for the new VM
|
98
98
|
* `data_store_name` - _Optional_ the datastore where the VM will be located
|
99
99
|
* `linked_clone` - _Optional_ link the cloned VM to the parent to share virtual disks
|
100
|
+
* `proxy_host` - _Optional_ proxy host name for connecting to vSphere via proxy
|
101
|
+
* `proxy_port` - _Optional_ proxy port number for connecting to vSphere via proxy
|
100
102
|
|
101
103
|
### Cloning from a VM rather than a template
|
102
104
|
|
@@ -149,6 +151,8 @@ This is useful if running Vagrant from multiple directories or if multiple machi
|
|
149
151
|
* 0.7.2
|
150
152
|
* includes template in get_location (from: tim95030 fixes issue #38)
|
151
153
|
* updates Gemfile to fall back to old version of vagrant for if ruby < 2.0.0 is available.
|
154
|
+
* 0.8.0
|
155
|
+
* Adds configuration for connecting via proxy server (tkak issue #40)
|
152
156
|
|
153
157
|
|
154
158
|
|
@@ -12,7 +12,10 @@ module VagrantPlugins
|
|
12
12
|
config = env[:machine].provider_config
|
13
13
|
|
14
14
|
begin
|
15
|
-
env[:vSphere_connection] = RbVmomi::VIM.connect host: config.host,
|
15
|
+
env[:vSphere_connection] = RbVmomi::VIM.connect host: config.host,
|
16
|
+
user: config.user, password: config.password,
|
17
|
+
insecure: config.insecure, proxyHost: config.proxy_host,
|
18
|
+
proxyPort: config.proxy_port
|
16
19
|
@app.call env
|
17
20
|
rescue Exception => e
|
18
21
|
puts e.backtrace
|
data/lib/vSphere/config.rb
CHANGED
data/lib/vSphere/version.rb
CHANGED
data/spec/spec_helper.rb
CHANGED
@@ -41,7 +41,9 @@ RSpec.configure do |config|
|
|
41
41
|
:customization_spec_name => nil,
|
42
42
|
:data_store_name => nil,
|
43
43
|
:clone_from_vm => nil,
|
44
|
-
:linked_clone => nil
|
44
|
+
:linked_clone => nil,
|
45
|
+
:proxy_host => nil,
|
46
|
+
:proxy_port => nil)
|
45
47
|
vm_config = double(
|
46
48
|
:vm => double('config_vm', :synced_folders => [], :provisioners => [], :networks => [[:private_network, {:ip => '0.0.0.0'}]]),
|
47
49
|
:validate => []
|
@@ -84,7 +86,7 @@ RSpec.configure do |config|
|
|
84
86
|
@data_center.stub(:find_vm).with(TEMPLATE).and_return(@template)
|
85
87
|
|
86
88
|
service_instance = double 'service_instance', :find_datacenter => @data_center
|
87
|
-
@ip = double 'ip', :ipAddress= => nil
|
89
|
+
@ip = double 'ip', :ipAddress= => nil
|
88
90
|
customization_spec = double 'customization spec', :nicSettingMap => [double('nic setting', :adapter => double('adapter', :ip => @ip))]
|
89
91
|
customization_spec.stub(:clone).and_return(customization_spec)
|
90
92
|
customization_spec_manager = double 'customization spec manager', :GetCustomizationSpec => double('spec info', :spec => customization_spec)
|