diff options
| author | Tim Smith <tsmith@chef.io> | 2019-05-06 22:47:41 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2019-05-07 10:37:11 -0700 |
| commit | 757c42835ccea7b6b617b119f51a667dfdecf4df (patch) | |
| tree | 4816d18d4ec974064cd93b9a3e564ebe32280a2b | |
| parent | 3f39c7eb9a5f0eadf768cc92630744f66242dfa3 (diff) | |
| download | chef-757c42835ccea7b6b617b119f51a667dfdecf4df.tar.gz | |
Update a few more knife.rb references to include config.rb
Most of the knife.rb mentions have been updated and the docs have been updated already. Mention both since every existing user is only familiar with knfie.rb.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -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 4cd7cdb73c..a5f56180fc 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -317,7 +317,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 @@ -498,7 +498,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 f05e63b420..01ab28c2b1 100644 --- a/lib/chef/shell.rb +++ b/lib/chef/shell.rb @@ -215,6 +215,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 |