summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Michael DuPont <JamesMikeDuPont@gmail.com>2015-09-03 00:18:56 -0400
committerThom May <thom@chef.io>2016-02-16 12:33:30 +0000
commit7ba8ea2b93f54bd60049e6f86cba2a73bf845d11 (patch)
treefa46c7a76b18eb4d9129f7dce0ce05372f745f92
parent61906bae0a660759ed59339bb8ae49521c25c636 (diff)
downloadchef-tm/h4ck3rm1k3-master-master.tar.gz
bugfix #2865 check for validation_keytm/h4ck3rm1k3-master-master
-rw-r--r--lib/chef/knife/core/bootstrap_context.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb
index a863e0cdb7..b05cae688c 100644
--- a/lib/chef/knife/core/bootstrap_context.rb
+++ b/lib/chef/knife/core/bootstrap_context.rb
@@ -44,7 +44,8 @@ class Chef
end
def validation_key
- if File.exist?(File.expand_path(@chef_config[:validation_key]))
+ if @chef_config.has_key?(:validation_key) &&
+ File.exist?(File.expand_path(@chef_config[:validation_key]))
IO.read(File.expand_path(@chef_config[:validation_key]))
else
false