diff options
| author | Tim Smith <tsmith@chef.io> | 2019-05-29 14:57:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 14:57:19 -0700 |
| commit | dc5ab171bc88380e9bcb500cd75452a710d05d62 (patch) | |
| tree | 97aa3f753057ea7566fb0266876a7ed8e6804f33 | |
| parent | a3b483c27d68f50c12bf94a46f9ef8961f32339a (diff) | |
| parent | d20f16a63a2541d356f5781366b27055cbf0190e (diff) | |
| download | chef-dc5ab171bc88380e9bcb500cd75452a710d05d62.tar.gz | |
Merge pull request #8608 from chef/backport_7
Update a few more knife.rb references to include config.rb
| -rw-r--r-- | lib/chef/knife.rb | 4 | ||||
| -rw-r--r-- | lib/chef/knife/config_list_profiles.rb | 2 | ||||
| -rw-r--r-- | lib/chef/shell.rb | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb index 2bb6169cc9..6051f9fd66 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -316,7 +316,7 @@ class Chef exit 1 end - # copy Mixlib::CLI over so that it can be configured in knife.rb + # copy Mixlib::CLI over so that it can be configured in config.rb/knife.rb # config file Chef::Config[:verbosity] = config[:verbosity] if config[:verbosity] end @@ -477,7 +477,7 @@ class Chef ui.info "Check your configuration file and ensure that your private key is readable" 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." + ui.info "Change your server location in config.rb/knife.rb to the server's FQDN to avoid unwanted redirections." else ui.error "#{e.class.name}: #{e.message}" end diff --git a/lib/chef/knife/config_list_profiles.rb b/lib/chef/knife/config_list_profiles.rb index b767e9dd42..5b971345c6 100644 --- a/lib/chef/knife/config_list_profiles.rb +++ b/lib/chef/knife/config_list_profiles.rb @@ -26,7 +26,7 @@ class Chef option :ignore_knife_rb, short: "-i", long: "--ignore-knife-rb", - description: "Ignore the current knife.rb configuration.", + description: "Ignore the current config.rb/knife.rb configuration.", default: false def run diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb index 6c5f70edcc..4aa99db857 100644 --- a/lib/chef/shell.rb +++ b/lib/chef/shell.rb @@ -214,6 +214,7 @@ module Shell * If no chef_shell.rb can be found, chef-shell falls back to load: /etc/chef/client.rb if -z option is given. /etc/chef/solo.rb if --solo-legacy-mode option is given. + .chef/config.rb if -s option is given. .chef/knife.rb if -s option is given. FOOTER |