vagrant-skytap 0.3.5 → 0.3.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -0
- data/Gemfile +7 -2
- data/lib/vagrant-skytap/action/get_host_vm.rb +1 -1
- data/lib/vagrant-skytap/api/client.rb +1 -1
- data/lib/vagrant-skytap/provider.rb +11 -0
- data/lib/vagrant-skytap/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c3f08f87dbf9b39c58d1c7ac1d1351b3ebe41dec
|
4
|
+
data.tar.gz: 006b50cbf19f4d81af13616bd06a989b92c89132
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 856903a0c6c66cb584ade420ea622497ce8fe07a5054377d113c1a5c1c1d62057b2b7c84c26b47de157a6776eab0ee515ea02bdfac110b043037d191b6d13521
|
7
|
+
data.tar.gz: 0c409c6828537eae0b230135ebb6e9507f921422deceb584b6e1be27297df5ed913771400c372776dd02d6ddefd2e18dd13c2a8f3d7e03ca756a3fbdec408312
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,10 @@
|
|
1
|
+
# 0.3.6 (August 2, 2017)
|
2
|
+
|
3
|
+
* Parameterize some Gemfile entries for testing purposes.
|
4
|
+
* Fix bug which limited the number of guest VMs to 3 when the host is also a
|
5
|
+
Skytap VM.
|
6
|
+
* Fix a bug in timeout error handling.
|
7
|
+
|
1
8
|
# 0.3.5 (January 3, 2017)
|
2
9
|
|
3
10
|
* Increase metadata service timeout, improve logging, handle still more errors (actually
|
data/Gemfile
CHANGED
@@ -2,6 +2,11 @@ source "https://rubygems.org"
|
|
2
2
|
|
3
3
|
gemspec
|
4
4
|
|
5
|
+
VAGRANT_GEM_TAG = ENV['VAGRANT_GEM_TAG'] || 'v1.7.4'
|
6
|
+
# vagrant-spec made a change in 1d09951e which created a dependency conflict
|
7
|
+
# in our test environment. For now, default to the preceding revision.
|
8
|
+
VAGRANT_SPEC_GEM_REF = ENV['VAGRANT_SPEC_REF'] || '5006bc73'
|
9
|
+
|
5
10
|
group :development do
|
6
11
|
# We depend on Vagrant for development, but we don't add it as a
|
7
12
|
# gem dependency because we expect to be installed within the
|
@@ -9,13 +14,13 @@ group :development do
|
|
9
14
|
if File.exist?(File.expand_path("../../vagrant", __FILE__))
|
10
15
|
gem 'vagrant', path: "../vagrant"
|
11
16
|
else
|
12
|
-
gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :
|
17
|
+
gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", tag: VAGRANT_GEM_TAG
|
13
18
|
end
|
14
19
|
|
15
20
|
if File.exist?(File.expand_path("../../vagrant-spec", __FILE__))
|
16
21
|
gem 'vagrant-spec', path: "../vagrant-spec"
|
17
22
|
else
|
18
|
-
gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git"
|
23
|
+
gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git", ref: VAGRANT_SPEC_GEM_REF
|
19
24
|
end
|
20
25
|
|
21
26
|
gem "rspec-expectations", "~> 2.14.0"
|
@@ -37,7 +37,7 @@ module VagrantPlugins
|
|
37
37
|
|
38
38
|
def call(env)
|
39
39
|
unless env[:vagrant_host_vm]
|
40
|
-
if metadata = env[:machine].provider.
|
40
|
+
if (metadata = env[:machine].provider.host_metadata)
|
41
41
|
# The environment will be lazy loaded
|
42
42
|
env[:vagrant_host_vm] = vm = API::Vm.new(metadata, nil, env)
|
43
43
|
@logger.info("Running Vagrant in a Skytap VM. ID: #{vm.try(:id)}")
|
@@ -26,6 +26,9 @@ require "vagrant"
|
|
26
26
|
module VagrantPlugins
|
27
27
|
module Skytap
|
28
28
|
class Provider < Vagrant.plugin("2", :provider)
|
29
|
+
@@host_metadata = nil
|
30
|
+
@@host_metadata_fetch_attempted = false
|
31
|
+
|
29
32
|
def initialize(machine)
|
30
33
|
@machine = machine
|
31
34
|
end
|
@@ -63,6 +66,14 @@ module VagrantPlugins
|
|
63
66
|
Vagrant::MachineState.new(state_id, short, long)
|
64
67
|
end
|
65
68
|
|
69
|
+
def host_metadata
|
70
|
+
unless @@host_metadata_fetch_attempted
|
71
|
+
@@host_metadata = capability(:host_metadata)
|
72
|
+
@@host_metadata_fetch_attempted = true
|
73
|
+
end
|
74
|
+
@@host_metadata
|
75
|
+
end
|
76
|
+
|
66
77
|
def to_s
|
67
78
|
id = @machine.id.nil? ? "new" : @machine.id
|
68
79
|
"Skytap (#{id})"
|
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.6
|
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: 2017-
|
12
|
+
date: 2017-08-02 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: json_pure
|