vagrant-skytap 0.3.2 → 0.3.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -0
- data/boxes/Vagrantfile +2 -1
- data/boxes/ubuntu-1204-x64-us-west.box +0 -0
- data/lib/vagrant-skytap/config.rb +2 -2
- data/lib/vagrant-skytap/connection/tunnel_choice.rb +5 -8
- data/lib/vagrant-skytap/version.rb +1 -1
- data/locales/en.yml +13 -7
- data/vagrant-spec.config.rb +2 -0
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 23cca41d3984a6e739646a9986ce68b3a9655c0f
|
4
|
+
data.tar.gz: 830c1d85da9fd373e726f22226e3c1210c8f8c32
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a5b9d656915ae1fea5dea53592aaf47d558bc841bd5dbcb519e2a8d4390a6eae1e97ecd10c6d118fab1b385dafce3285b8dac63ba34157c1f6d499e37cc8ecc8
|
7
|
+
data.tar.gz: e275fb3e235b03714d3e2b7c1ce972799f96efade7c0adfe28b6337f20975b63e9887f8bc8d3ce17d287d1eeb1ccd5fe6842ea606935b066abe5a5ff8f2a8465
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,9 @@
|
|
1
|
+
# 0.3.3 (April 25, 2016)
|
2
|
+
|
3
|
+
* Improve error messaging for network tunnels.
|
4
|
+
* Change default timeout value.
|
5
|
+
* Update Vagrantfile for example box file.
|
6
|
+
|
1
7
|
# 0.3.2 (April 19, 2016)
|
2
8
|
|
3
9
|
* Retry all operations on 423 response (previously this was not happening when attaching to a VPN).
|
data/boxes/Vagrantfile
CHANGED
Binary file
|
@@ -109,8 +109,8 @@ module VagrantPlugins
|
|
109
109
|
# VPN to use for connection to VM
|
110
110
|
@vpn_url = nil if @vpn_url == UNSET_VALUE
|
111
111
|
|
112
|
-
# Set the default timeout for
|
113
|
-
@instance_ready_timeout =
|
112
|
+
# Set the default timeout for runstate changes (e.g. running a VM)
|
113
|
+
@instance_ready_timeout = 300 if @instance_ready_timeout == UNSET_VALUE
|
114
114
|
|
115
115
|
# Hardware settings default to nil (will be obtained
|
116
116
|
# from the source VM)
|
@@ -51,19 +51,16 @@ module VagrantPlugins
|
|
51
51
|
def valid?
|
52
52
|
@validation_error_message = nil
|
53
53
|
|
54
|
-
unless host_network.tunnelable?
|
55
|
-
@validation_error_message = I18n.t("vagrant_skytap.connections.tunnel.errors.
|
56
|
-
return false
|
57
|
-
end
|
58
|
-
|
59
|
-
unless host_network.nat_enabled?
|
60
|
-
@validation_error_message = I18n.t("vagrant_skytap.connections.tunnel.errors.host_network_nat_disabled")
|
54
|
+
unless host_network.tunnelable? && host_network.nat_enabled?
|
55
|
+
@validation_error_message = I18n.t("vagrant_skytap.connections.tunnel.errors.host_network_not_connectable")
|
61
56
|
return false
|
62
57
|
end
|
63
58
|
|
64
59
|
unless guest_network.nat_enabled?
|
65
60
|
if guest_network.subnet.overlaps?(host_network.subnet)
|
66
|
-
@validation_error_message = I18n.t("vagrant_skytap.connections.tunnel.errors.guest_network_overlaps"
|
61
|
+
@validation_error_message = I18n.t("vagrant_skytap.connections.tunnel.errors.guest_network_overlaps",
|
62
|
+
guest_subnet: guest_network.subnet, host_subnet: host_network.subnet,
|
63
|
+
environment_url: iface.vm.environment.url)
|
67
64
|
return false
|
68
65
|
end
|
69
66
|
end
|
data/locales/en.yml
CHANGED
@@ -184,14 +184,20 @@ en:
|
|
184
184
|
verb_create_and_use: |-
|
185
185
|
Create and use tunnel to host network
|
186
186
|
errors:
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
187
|
+
host_network_not_connectable: |-
|
188
|
+
To connect to the guest machine using a network tunnel, the host
|
189
|
+
VM must be connected to a network which is visible to other
|
190
|
+
networks and has a NAT subnet. Please go to the network settings
|
191
|
+
page for this VM and make these changes, then run `vagrant up` to
|
192
|
+
try again. (Note: it may be necessary to power off this VM before
|
193
|
+
making these changes.)
|
191
194
|
guest_network_overlaps: |-
|
192
|
-
The guest
|
193
|
-
|
194
|
-
|
195
|
+
The host and guest networks could not be connected via a network
|
196
|
+
tunnel because the guest VM's network subnet (%{guest_subnet})
|
197
|
+
overlaps with the host network subnet (%{host_subnet}). Please
|
198
|
+
change the guest network's subnet, or enable NAT on the guest
|
199
|
+
network's subnet, then run `vagrant up` to try again.
|
200
|
+
The guest VM's environment URL is: %{environment_url}
|
195
201
|
|
196
202
|
commands:
|
197
203
|
publish_urls:
|
data/vagrant-spec.config.rb
CHANGED
@@ -4,6 +4,8 @@ Vagrant::Spec::Acceptance.configure do |c|
|
|
4
4
|
c.component_paths << File.expand_path("../spec/acceptance", __FILE__)
|
5
5
|
c.skeleton_paths << File.expand_path("../spec/acceptance/skeletons", __FILE__)
|
6
6
|
|
7
|
+
c.assert_retries = 10
|
8
|
+
|
7
9
|
c.provider "skytap",
|
8
10
|
box: File.expand_path("../skytap-test.box", __FILE__),
|
9
11
|
contexts: ["provider-context/skytap"]
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-skytap
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Eric True
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2016-04-
|
12
|
+
date: 2016-04-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: json_pure
|
@@ -120,6 +120,7 @@ files:
|
|
120
120
|
- boxes/empty.box
|
121
121
|
- boxes/metadata.json
|
122
122
|
- boxes/README.md
|
123
|
+
- boxes/ubuntu-1204-x64-us-west.box
|
123
124
|
- boxes/Vagrantfile
|
124
125
|
- CHANGELOG.md
|
125
126
|
- Gemfile
|