vagrant-ohai 0.1.3 → 0.1.4
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
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
ODhlMGZhZjAwMGMxNjQ2OWI5ZGNlZmIwYWYzZTU3MzM3NWVlOGJjMw==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
ZGYwNDIxYTFiMGM3NDlkNzlhOWQ5NzE1YTk5MmZlZjY5ZTI0YThhMA==
|
|
7
7
|
!binary "U0hBNTEy":
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
NzZlYzdiMmZkODA3NTFiYTU5YjM0ODk4MDdlOGNiM2E4NDgyYWE5ZGEzNGJk
|
|
10
|
+
ZDE2ZjM1YzcwMzc3NjdmOGQ0NmFiOTQ0YjFlZDg0MTAxMzkzMGY0ZTcwZWYy
|
|
11
|
+
YjhjNThiNWZjOGFkMmZiNDg5ZTU5ZTkzODQyZWJhZWM5MjFmODQ=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
NTQ2ZjEzY2I1OTNjZjM5OTUzZTYyNmZjZWUzM2RiZTQ4ZWI2ZWZiMDI0YTk5
|
|
14
|
+
ODBlY2Y2NTAzZDExNDBjZGRhYTFlYTVlODRlNGJjZDBjN2Y2NmU0Mzg3NzEy
|
|
15
|
+
YjQxZGQwMTcwMGMxZTJjNWI0MDFkMThmN2ViMTA1NTAyYWFmNzE=
|
|
@@ -29,6 +29,7 @@ module VagrantPlugins
|
|
|
29
29
|
end
|
|
30
30
|
|
|
31
31
|
def register_custom_chef_config
|
|
32
|
+
return unless @machine.config.ohai.enable
|
|
32
33
|
chef_provisioners.each do |provisioner|
|
|
33
34
|
if provisioner.config.respond_to? :custom_config_path and not provisioner.config.custom_config_path == Plugin::UNSET_VALUE
|
|
34
35
|
current_custom_config_path = provisioner.config.custom_config_path
|
|
@@ -36,7 +37,7 @@ module VagrantPlugins
|
|
|
36
37
|
current_custom_config_path = nil
|
|
37
38
|
end
|
|
38
39
|
custom_config = ohai_custom_config(current_custom_config_path)
|
|
39
|
-
provisioner.config.instance_variable_set("@custom_config_path", custom_config.path)
|
|
40
|
+
provisioner.config.instance_variable_set("@custom_config_path", custom_config.path)
|
|
40
41
|
end
|
|
41
42
|
end
|
|
42
43
|
end
|
|
@@ -17,7 +17,7 @@ module VagrantPlugins
|
|
|
17
17
|
@app.call(env)
|
|
18
18
|
return unless @machine.communicate.ready?
|
|
19
19
|
|
|
20
|
-
if chef_provisioners.any?
|
|
20
|
+
if chef_provisioners.any? and @machine.config.ohai.enable
|
|
21
21
|
@machine.ui.info("Installing Ohai plugin")
|
|
22
22
|
create_ohai_folders
|
|
23
23
|
copy_ohai_plugin
|
|
@@ -43,6 +43,7 @@ module VagrantPlugins
|
|
|
43
43
|
def vagrant_info
|
|
44
44
|
info = {}
|
|
45
45
|
info[:private_ipv4] = private_ipv4 if private_ipv4
|
|
46
|
+
info[:box] = @machine.config.vm.box
|
|
46
47
|
info
|
|
47
48
|
end
|
|
48
49
|
|
|
@@ -51,7 +52,7 @@ module VagrantPlugins
|
|
|
51
52
|
hint_file.write(vagrant_info.to_json)
|
|
52
53
|
hint_file.close
|
|
53
54
|
@machine.communicate.upload(hint_file.path, "/etc/chef/ohai/hints/vagrant.json")
|
|
54
|
-
end
|
|
55
|
+
end
|
|
55
56
|
|
|
56
57
|
def copy_ohai_plugin
|
|
57
58
|
@machine.communicate.upload(OHAI_PLUGIN_PATH, "/etc/chef/ohai_plugins/vagrant.rb")
|
data/lib/vagrant-ohai/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vagrant-ohai
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Avishai Ish-Shalom
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2013-
|
|
11
|
+
date: 2013-10-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -86,4 +86,3 @@ signing_key:
|
|
|
86
86
|
specification_version: 4
|
|
87
87
|
summary: Vagrant plugin which installs an Ohai plugn to properly detect private ipaddress
|
|
88
88
|
test_files: []
|
|
89
|
-
has_rdoc:
|