chef-metal-vagrant 0.4.beta → 0.4.beta.2
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/lib/chef_metal_vagrant/vagrant_driver.rb +10 -4
- data/lib/chef_metal_vagrant/version.rb +1 -1
- metadata +13 -13
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 355baae7bdd40249b03745893deda28e2ca98b5e
|
|
4
|
+
data.tar.gz: 817c6d032e2a5bb9c13eabec1031e5e519702ae2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 614f0fc82d5486f43a3ebcfdd82f89e6503daaffb8878d7ce5fc9711198d03ee282bbc8055535f7d550852e32e314b627b44701dbc10120142c1f0fe1d0b92d8
|
|
7
|
+
data.tar.gz: 928c35bd503888a669b60afd2c8c1f5ddfa62a91378d29cae9e53cb7e085ed17e2bcf780a26a06a9cbfec0371071fe78346c479c421d9ee03f0cc69172502c6d
|
|
@@ -30,9 +30,13 @@ module ChefMetalVagrant
|
|
|
30
30
|
attr_reader :cluster_path
|
|
31
31
|
|
|
32
32
|
def self.from_url(driver_url, config)
|
|
33
|
+
VagrantDriver.new(driver_url, config)
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
def self.canonicalize_url(driver_url, config)
|
|
33
37
|
scheme, cluster_path = driver_url.split(':', 2)
|
|
34
38
|
cluster_path = File.expand_path(cluster_path || File.join(Chef::Config.config_dir, 'vms'))
|
|
35
|
-
|
|
39
|
+
"vagrant:#{cluster_path}"
|
|
36
40
|
end
|
|
37
41
|
|
|
38
42
|
# Acquire a machine, generally by provisioning it. Returns a Machine
|
|
@@ -117,7 +121,9 @@ module ChefMetalVagrant
|
|
|
117
121
|
start_machines(action_handler, specs_and_options)
|
|
118
122
|
machines = []
|
|
119
123
|
specs_and_options.each_pair do |spec, options|
|
|
120
|
-
|
|
124
|
+
machine = machine_for(spec, options)
|
|
125
|
+
machines << machine
|
|
126
|
+
yield machine if block_given?
|
|
121
127
|
end
|
|
122
128
|
machines
|
|
123
129
|
end
|
|
@@ -147,8 +153,7 @@ module ChefMetalVagrant
|
|
|
147
153
|
end
|
|
148
154
|
end
|
|
149
155
|
specs_and_options.each_pair do |spec, options|
|
|
150
|
-
convergence_strategy_for(spec, options).
|
|
151
|
-
cleanup_convergence(action_handler, spec)
|
|
156
|
+
convergence_strategy_for(spec, options).cleanup_convergence(action_handler, spec)
|
|
152
157
|
|
|
153
158
|
vm_file_path = spec.location['vm_file_path']
|
|
154
159
|
ChefMetal.inline_resource(action_handler) do
|
|
@@ -156,6 +161,7 @@ module ChefMetalVagrant
|
|
|
156
161
|
action :delete
|
|
157
162
|
end
|
|
158
163
|
end
|
|
164
|
+
yield spec if block_given?
|
|
159
165
|
end
|
|
160
166
|
end
|
|
161
167
|
|
metadata
CHANGED
|
@@ -1,55 +1,55 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: chef-metal-vagrant
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.beta
|
|
4
|
+
version: 0.4.beta.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- John Keiser
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-05-
|
|
11
|
+
date: 2014-05-31 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: chef
|
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
|
16
16
|
requirements:
|
|
17
|
-
- -
|
|
17
|
+
- - ">="
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
19
|
version: '0'
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
|
-
- -
|
|
24
|
+
- - ">="
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
26
|
version: '0'
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: rspec
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
|
-
- -
|
|
31
|
+
- - ">="
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
33
|
version: '0'
|
|
34
34
|
type: :development
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
|
-
- -
|
|
38
|
+
- - ">="
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
40
|
version: '0'
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: rake
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
|
-
- -
|
|
45
|
+
- - ">="
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
47
|
version: '0'
|
|
48
48
|
type: :development
|
|
49
49
|
prerelease: false
|
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
|
51
51
|
requirements:
|
|
52
|
-
- -
|
|
52
|
+
- - ">="
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
54
|
version: '0'
|
|
55
55
|
description: Driver for creating Vagrant instances in Chef Metal.
|
|
@@ -60,17 +60,17 @@ extra_rdoc_files:
|
|
|
60
60
|
- README.md
|
|
61
61
|
- LICENSE
|
|
62
62
|
files:
|
|
63
|
-
- Rakefile
|
|
64
63
|
- LICENSE
|
|
65
64
|
- README.md
|
|
65
|
+
- Rakefile
|
|
66
66
|
- lib/chef/provider/vagrant_box.rb
|
|
67
67
|
- lib/chef/provider/vagrant_cluster.rb
|
|
68
68
|
- lib/chef/resource/vagrant_box.rb
|
|
69
69
|
- lib/chef/resource/vagrant_cluster.rb
|
|
70
70
|
- lib/chef_metal/driver_init/vagrant.rb
|
|
71
|
+
- lib/chef_metal_vagrant.rb
|
|
71
72
|
- lib/chef_metal_vagrant/vagrant_driver.rb
|
|
72
73
|
- lib/chef_metal_vagrant/version.rb
|
|
73
|
-
- lib/chef_metal_vagrant.rb
|
|
74
74
|
homepage: https://github.com/opscode/chef-metal-fog
|
|
75
75
|
licenses: []
|
|
76
76
|
metadata: {}
|
|
@@ -80,17 +80,17 @@ require_paths:
|
|
|
80
80
|
- lib
|
|
81
81
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
82
82
|
requirements:
|
|
83
|
-
- -
|
|
83
|
+
- - ">="
|
|
84
84
|
- !ruby/object:Gem::Version
|
|
85
85
|
version: '0'
|
|
86
86
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
87
87
|
requirements:
|
|
88
|
-
- -
|
|
88
|
+
- - ">"
|
|
89
89
|
- !ruby/object:Gem::Version
|
|
90
90
|
version: 1.3.1
|
|
91
91
|
requirements: []
|
|
92
92
|
rubyforge_project:
|
|
93
|
-
rubygems_version: 2.
|
|
93
|
+
rubygems_version: 2.2.2
|
|
94
94
|
signing_key:
|
|
95
95
|
specification_version: 4
|
|
96
96
|
summary: Driver for creating Vagrant instances in Chef Metal.
|