summaryrefslogtreecommitdiff
path: root/lib/chef/knife
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/knife')
-rw-r--r--lib/chef/knife/bootstrap.rb2
-rw-r--r--lib/chef/knife/bootstrap/chef_vault_handler.rb3
-rw-r--r--lib/chef/knife/cookbook_site_download.rb3
-rw-r--r--lib/chef/knife/cookbook_site_install.rb3
-rw-r--r--lib/chef/knife/cookbook_site_list.rb3
-rw-r--r--lib/chef/knife/cookbook_site_search.rb3
-rw-r--r--lib/chef/knife/cookbook_site_share.rb3
-rw-r--r--lib/chef/knife/cookbook_site_show.rb3
-rw-r--r--lib/chef/knife/cookbook_site_unshare.rb3
-rw-r--r--lib/chef/knife/exec.rb3
-rw-r--r--lib/chef/knife/node_show.rb3
-rw-r--r--lib/chef/knife/serve.rb5
-rw-r--r--lib/chef/knife/ssl_check.rb3
-rw-r--r--lib/chef/knife/status.rb3
14 files changed, 27 insertions, 16 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index d7f4518de6..1da36db37f 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -177,7 +177,7 @@ class Chef
# client.rb content via bootstrap_context
option :bootstrap_no_proxy,
long: "--bootstrap-no-proxy [NO_PROXY_URL|NO_PROXY_IP]",
- description: "Do not proxy locations for the node being bootstrapped; this option is used internally by Chef.",
+ description: "Do not proxy locations for the node being bootstrapped",
proc: Proc.new { |np| Chef::Config[:knife][:bootstrap_no_proxy] = np }
# client.rb content via bootstrap_context
diff --git a/lib/chef/knife/bootstrap/chef_vault_handler.rb b/lib/chef/knife/bootstrap/chef_vault_handler.rb
index 233350de73..605a9d359b 100644
--- a/lib/chef/knife/bootstrap/chef_vault_handler.rb
+++ b/lib/chef/knife/bootstrap/chef_vault_handler.rb
@@ -15,7 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
class Chef
class Knife
class Bootstrap < Knife
@@ -141,7 +140,7 @@ class Chef
def require_chef_vault!
@require_chef_vault ||=
begin
- error_message = "Knife bootstrap requires version 2.6.0 or higher of the chef-vault gem to configure chef vault items"
+ error_message = "Knife bootstrap requires version 2.6.0 or higher of the chef-vault gem to configure vault items"
require "chef-vault"
if Gem::Version.new(ChefVault::VERSION) < Gem::Version.new("2.6.0")
raise error_message
diff --git a/lib/chef/knife/cookbook_site_download.rb b/lib/chef/knife/cookbook_site_download.rb
index 4fc435f957..cbe4a92604 100644
--- a/lib/chef/knife/cookbook_site_download.rb
+++ b/lib/chef/knife/cookbook_site_download.rb
@@ -18,6 +18,7 @@
require_relative "../knife"
require_relative "supermarket_download"
+require_relative "../dist"
class Chef
class Knife
@@ -30,7 +31,7 @@ class Chef
category "deprecated"
def run
- Chef::Log.warn("knife cookbook site download has been deprecated in favor of knife supermarket download. In Chef 16 (April 2020) this will result in an error!")
+ Chef::Log.warn("knife cookbook site download has been deprecated in favor of knife supermarket download. In #{Chef::Dist::PRODUCT} 16 (April 2020) this will result in an error!")
super
end
diff --git a/lib/chef/knife/cookbook_site_install.rb b/lib/chef/knife/cookbook_site_install.rb
index a9c15661ff..785eb91e38 100644
--- a/lib/chef/knife/cookbook_site_install.rb
+++ b/lib/chef/knife/cookbook_site_install.rb
@@ -18,6 +18,7 @@
require_relative "../knife"
require_relative "supermarket_install"
+require_relative "../dist"
class Chef
class Knife
@@ -30,7 +31,7 @@ class Chef
category "deprecated"
def run
- Chef::Log.warn("knife cookbook site install has been deprecated in favor of knife supermarket install. In Chef 16 (April 2020) this will result in an error!")
+ Chef::Log.warn("knife cookbook site install has been deprecated in favor of knife supermarket install. In #{Chef::Dist::PRODUCT} 16 (April 2020) this will result in an error!")
super
end
diff --git a/lib/chef/knife/cookbook_site_list.rb b/lib/chef/knife/cookbook_site_list.rb
index 27c836c247..10b3c6b589 100644
--- a/lib/chef/knife/cookbook_site_list.rb
+++ b/lib/chef/knife/cookbook_site_list.rb
@@ -18,6 +18,7 @@
require_relative "../knife"
require_relative "supermarket_list"
+require_relative "../dist"
class Chef
class Knife
@@ -30,7 +31,7 @@ class Chef
category "deprecated"
def run
- Chef::Log.warn("knife cookbook site list has been deprecated in favor of knife supermarket list. In Chef 16 (April 2020) this will result in an error!")
+ Chef::Log.warn("knife cookbook site list has been deprecated in favor of knife supermarket list. In #{Chef::Dist::PRODUCT} 16 (April 2020) this will result in an error!")
super
end
diff --git a/lib/chef/knife/cookbook_site_search.rb b/lib/chef/knife/cookbook_site_search.rb
index 9e36afc5ff..6557528c8a 100644
--- a/lib/chef/knife/cookbook_site_search.rb
+++ b/lib/chef/knife/cookbook_site_search.rb
@@ -18,6 +18,7 @@
require_relative "../knife"
require_relative "supermarket_search"
+require_relative "../dist"
class Chef
class Knife
@@ -30,7 +31,7 @@ class Chef
category "deprecated"
def run
- Chef::Log.warn("knife cookbook site search has been deprecated in favor of knife supermarket search. In Chef 16 (April 2020) this will result in an error!")
+ Chef::Log.warn("knife cookbook site search has been deprecated in favor of knife supermarket search. In #{Chef::Dist::PRODUCT} 16 (April 2020) this will result in an error!")
super
end
diff --git a/lib/chef/knife/cookbook_site_share.rb b/lib/chef/knife/cookbook_site_share.rb
index d959784bb9..9569d9ab53 100644
--- a/lib/chef/knife/cookbook_site_share.rb
+++ b/lib/chef/knife/cookbook_site_share.rb
@@ -19,6 +19,7 @@
require_relative "../knife"
require_relative "supermarket_share"
+require_relative "../dist"
class Chef
class Knife
@@ -31,7 +32,7 @@ class Chef
category "deprecated"
def run
- Chef::Log.warn("knife cookbook site share has been deprecated in favor of knife supermarket share. In Chef 16 (April 2020) this will result in an error!")
+ Chef::Log.warn("knife cookbook site share has been deprecated in favor of knife supermarket share. In #{Chef::Dist::PRODUCT} 16 (April 2020) this will result in an error!")
super
end
diff --git a/lib/chef/knife/cookbook_site_show.rb b/lib/chef/knife/cookbook_site_show.rb
index 84a7c249e5..3fa390508f 100644
--- a/lib/chef/knife/cookbook_site_show.rb
+++ b/lib/chef/knife/cookbook_site_show.rb
@@ -18,6 +18,7 @@
require_relative "../knife"
require_relative "supermarket_show"
+require_relative "../dist"
class Chef
class Knife
@@ -30,7 +31,7 @@ class Chef
category "deprecated"
def run
- Chef::Log.warn("knife cookbook site show has been deprecated in favor of knife supermarket show. In Chef 16 (April 2020) this will result in an error!")
+ Chef::Log.warn("knife cookbook site show has been deprecated in favor of knife supermarket show. In #{Chef::Dist::PRODUCT} 16 (April 2020) this will result in an error!")
super
end
diff --git a/lib/chef/knife/cookbook_site_unshare.rb b/lib/chef/knife/cookbook_site_unshare.rb
index f712ad97e4..53d32aa85b 100644
--- a/lib/chef/knife/cookbook_site_unshare.rb
+++ b/lib/chef/knife/cookbook_site_unshare.rb
@@ -19,6 +19,7 @@
require_relative "../knife"
require_relative "supermarket_unshare"
+require_relative "../dist"
class Chef
class Knife
@@ -31,7 +32,7 @@ class Chef
category "deprecated"
def run
- Chef::Log.warn("knife cookbook site unshare has been deprecated in favor of knife supermarket unshare. In Chef 16 (April 2020) this will result in an error!")
+ Chef::Log.warn("knife cookbook site unshare has been deprecated in favor of knife supermarket unshare. In #{Chef::Dist::PRODUCT} 16 (April 2020) this will result in an error!")
super
end
diff --git a/lib/chef/knife/exec.rb b/lib/chef/knife/exec.rb
index 7a5d77abd5..4b7f570aec 100644
--- a/lib/chef/knife/exec.rb
+++ b/lib/chef/knife/exec.rb
@@ -18,6 +18,7 @@
require_relative "../knife"
require_relative "../util/path_helper"
+require_relative "../dist"
class Chef::Knife::Exec < Chef::Knife
@@ -26,7 +27,7 @@ class Chef::Knife::Exec < Chef::Knife
option :exec,
short: "-E CODE",
long: "--exec CODE",
- description: "A string of Chef code to execute."
+ description: "A string of #{Chef::Dist::PRODUCT} code to execute."
option :script_path,
short: "-p PATH:PATH",
diff --git a/lib/chef/knife/node_show.rb b/lib/chef/knife/node_show.rb
index d06e09d94e..57a4c35cee 100644
--- a/lib/chef/knife/node_show.rb
+++ b/lib/chef/knife/node_show.rb
@@ -18,6 +18,7 @@
require_relative "../knife"
require_relative "core/node_presenter"
+require_relative "../dist"
class Chef
class Knife
@@ -41,7 +42,7 @@ class Chef
option :environment,
short: "-E",
long: "--environment",
- description: "Show only the Chef environment."
+ description: "Show only the #{Chef::Dist::PRODUCT} environment."
def run
ui.use_presenter Knife::Core::NodePresenter
diff --git a/lib/chef/knife/serve.rb b/lib/chef/knife/serve.rb
index ccb5d4ea29..cce2ff6576 100644
--- a/lib/chef/knife/serve.rb
+++ b/lib/chef/knife/serve.rb
@@ -16,6 +16,7 @@
require_relative "../knife"
require_relative "../local_mode"
+require_relative "../dist"
class Chef
class Knife
@@ -29,11 +30,11 @@ class Chef
option :chef_repo_path,
long: "--chef-repo-path PATH",
- description: "Overrides the location of chef repo. Default is specified by chef_repo_path in the config."
+ description: "Overrides the location of #{Chef::Dist::PRODUCT} repo. Default is specified by chef_repo_path in the config."
option :chef_zero_host,
long: "--chef-zero-host IP",
- description: "Overrides the host upon which chef-zero listens. Default is 127.0.0.1."
+ description: "Overrides the host upon which #{Chef::Dist::ZERO} listens. Default is 127.0.0.1."
def configure_chef
super
diff --git a/lib/chef/knife/ssl_check.rb b/lib/chef/knife/ssl_check.rb
index 46a1f2f3b0..1668331ea4 100644
--- a/lib/chef/knife/ssl_check.rb
+++ b/lib/chef/knife/ssl_check.rb
@@ -18,6 +18,7 @@
require_relative "../knife"
require_relative "../config"
+require_relative "../dist"
class Chef
class Knife
@@ -233,7 +234,7 @@ class Chef
end
def debug_chef_ssl_config
- ui.err "Chef SSL Configuration:"
+ ui.err "#{Chef::Dist::PRODUCT} SSL Configuration:"
ui.err "* ssl_ca_path: #{configuration.ssl_ca_path.inspect}"
ui.err "* ssl_ca_file: #{configuration.ssl_ca_file.inspect}"
ui.err "* trusted_certs_dir: #{configuration.trusted_certs_dir.inspect}"
diff --git a/lib/chef/knife/status.rb b/lib/chef/knife/status.rb
index 4e51b4a2ad..074488e003 100644
--- a/lib/chef/knife/status.rb
+++ b/lib/chef/knife/status.rb
@@ -19,6 +19,7 @@
require_relative "../knife"
require_relative "core/status_presenter"
require_relative "core/node_presenter"
+require_relative "../dist"
class Chef
class Knife
@@ -43,7 +44,7 @@ class Chef
option :hide_by_mins,
long: "--hide-by-mins MINS",
- description: "Hide nodes that have run chef in the last MINS minutes"
+ description: "Hide nodes that have run #{Chef::Dist::CLIENT} in the last MINS minutes"
def append_to_query(term)
@query << " AND " unless @query.empty?
View Lorry Controller Status