diff options
| author | Serdar Sutay <serdar@opscode.com> | 2014-08-21 12:56:11 -0700 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-08-26 15:42:26 -0700 |
| commit | 63c044871c93c9ed3fa80536a036dc8642a78d0e (patch) | |
| tree | b08d81dcdf18ccb2c48a485ff2c92fb8e221d490 /lib/chef/knife/core/bootstrap_context.rb | |
| parent | 622feda734f351461255ddbd222ff1b633b2ff9c (diff) | |
| download | chef-63c044871c93c9ed3fa80536a036dc8642a78d0e.tar.gz | |
Remove encrypted_data_bag_secret distribution via Chef::Config and enable distributing it via knife[:secret] and knife[:secret_file].
Diffstat (limited to 'lib/chef/knife/core/bootstrap_context.rb')
| -rw-r--r-- | lib/chef/knife/core/bootstrap_context.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb index aa6bbb7f5c..5781481b40 100644 --- a/lib/chef/knife/core/bootstrap_context.rb +++ b/lib/chef/knife/core/bootstrap_context.rb @@ -46,8 +46,8 @@ class Chef knife_config[:secret] || begin if knife_config[:secret_file] && File.exist?(knife_config[:secret_file]) IO.read(File.expand_path(knife_config[:secret_file])) - elsif @chef_config[:encrypted_data_bag_secret] && File.exist?(@chef_config[:encrypted_data_bag_secret]) - IO.read(File.expand_path(@chef_config[:encrypted_data_bag_secret])) + else + nil end end end |