knife-ec2 0.6.0 → 0.6.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.
- data/lib/chef/knife/ec2_server_create.rb +5 -1
- data/lib/knife-ec2/version.rb +1 -1
- metadata +2 -2
|
@@ -180,11 +180,11 @@ class Chef
|
|
|
180
180
|
:proc => Proc.new { |m| Chef::Config[:knife][:aws_user_data] = m },
|
|
181
181
|
:default => nil
|
|
182
182
|
|
|
183
|
-
Chef::Config[:knife][:hints] ||= {"ec2" => {}}
|
|
184
183
|
option :hint,
|
|
185
184
|
:long => "--hint HINT_NAME[=HINT_FILE]",
|
|
186
185
|
:description => "Specify Ohai Hint to be set on the bootstrap target. Use multiple --hint options to specify multiple hints.",
|
|
187
186
|
:proc => Proc.new { |h|
|
|
187
|
+
Chef::Config[:knife][:hints] ||= {}
|
|
188
188
|
name, path = h.split("=")
|
|
189
189
|
Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new
|
|
190
190
|
}
|
|
@@ -343,6 +343,10 @@ class Chef
|
|
|
343
343
|
bootstrap.config[:environment] = config[:environment]
|
|
344
344
|
# may be needed for vpc_mode
|
|
345
345
|
bootstrap.config[:host_key_verify] = config[:host_key_verify]
|
|
346
|
+
# Modify global configuration state to ensure hint gets set by
|
|
347
|
+
# knife-bootstrap
|
|
348
|
+
Chef::Config[:knife][:hints] ||= {}
|
|
349
|
+
Chef::Config[:knife][:hints]["ec2"] ||= {}
|
|
346
350
|
bootstrap
|
|
347
351
|
end
|
|
348
352
|
|
data/lib/knife-ec2/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: knife-ec2
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.2
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2012-10-
|
|
13
|
+
date: 2012-10-24 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: fog
|