knife-ec2 0.6.0 → 0.6.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -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
 
@@ -1,6 +1,6 @@
1
1
  module Knife
2
2
  module Ec2
3
- VERSION = "0.6.0"
3
+ VERSION = "0.6.2"
4
4
  MAJOR, MINOR, TINY = VERSION.split('.')
5
5
  end
6
6
  end
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.0
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-16 00:00:00.000000000 Z
13
+ date: 2012-10-24 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: fog