summaryrefslogtreecommitdiff
path: root/lib/chef/knife.rb
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-12 12:36:14 -0700
committerGitHub <noreply@github.com>2018-03-12 12:36:14 -0700
commit797fe20ea3b529a36dc6a88e6101d3544b9ecb70 (patch)
tree23213fffe8302dda586746fc2c16412bfc3193b0 /lib/chef/knife.rb
parentde0ed26e4b0a42f3af827912339ecae65253b52b (diff)
parent2e94dd8d733b9bae92228f4eca2dcdb0c58594c3 (diff)
downloadchef-797fe20ea3b529a36dc6a88e6101d3544b9ecb70.tar.gz
Merge pull request #6253 from jeunito/feat/5556
Knife should give a useful error when the chef_server_url isn't a chef server API
Diffstat (limited to 'lib/chef/knife.rb')
-rw-r--r--lib/chef/knife.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb
index 4e975c2b27..49b4b50cd7 100644
--- a/lib/chef/knife.rb
+++ b/lib/chef/knife.rb
@@ -475,6 +475,8 @@ class Chef
when Chef::Exceptions::InvalidRedirect
ui.error "Invalid Redirect: #{e.message}"
ui.info "Change your server location in knife.rb to the server's FQDN to avoid unwanted redirections."
+ when Chef::Exceptions::NotAChefServerException
+ ui.error "#{Chef::Config[:chef_server_url]} is not a valid chef server"
else
ui.error "#{e.class.name}: #{e.message}"
end