diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-11 17:36:52 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-11 17:36:52 -0700 |
| commit | 3f415b11dfb1c494a45a0a83d69196cd75924cf1 (patch) | |
| tree | ee6bbff8836a1a8514fe3be7ce9ead67ad8cb02a /lib/chef/knife/bootstrap.rb | |
| parent | b4dfc6a1f478f29105a3b4746029e3ad46291b82 (diff) | |
| download | chef-3f415b11dfb1c494a45a0a83d69196cd75924cf1.tar.gz | |
remove JSON gem usage
should fully convert to using ffi-yajl
there are still issues with JSON gem monkeypatching interacting with
chef-zero and the spec tests so we keep the requires here for the
json gem and the ffi_yajl/json_gem here. when ohai and chef-zero are
fixed, we an just require ffi_yajl.
Diffstat (limited to 'lib/chef/knife/bootstrap.rb')
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index 46cacbd3e0..d3d45bad4b 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -126,7 +126,7 @@ class Chef :short => "-j JSON_ATTRIBS", :long => "--json-attributes", :description => "A JSON string to be added to the first run of chef-client", - :proc => lambda { |o| JSON.parse(o) }, + :proc => lambda { |o| Chef::JSONCompat.parse(o) }, :default => {} option :host_key_verify, @@ -141,7 +141,7 @@ class Chef :proc => Proc.new { |h| Chef::Config[:knife][:hints] ||= Hash.new name, path = h.split("=") - Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new } + Chef::Config[:knife][:hints][name] = path ? Chef::JSONCompat.parse(::File.read(path)) : Hash.new } option :secret, :short => "-s SECRET", |