Rename openssl-fips to fips and add messages

4 files changed, 8 insertions, 8 deletions

diff --git a/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb
index 901caa92cf..ab450cdeac 100644
--- a/lib/chef/formatters/doc.rb
+++ b/lib/chef/formatters/doc.rb
@@ -42,8 +42,8 @@ class Chef
       end
 
       def run_start(version)
-        puts_line "Starting Chef Client#{" (FIPS mode)" if Chef::Config[:openssl_fips]}" \
-          ", version #{version}"
+        puts_line "Starting Chef Client, version #{version}"
+        puts_line "OpenSSL FIPS 140 mode enabled" if Chef::Config[:fips]
       end
 
       def total_resources
diff --git a/lib/chef/formatters/minimal.rb b/lib/chef/formatters/minimal.rb
index baf0273103..94fbfd3818 100644
--- a/lib/chef/formatters/minimal.rb
+++ b/lib/chef/formatters/minimal.rb
@@ -29,8 +29,8 @@ class Chef
 
       # Called at the very start of a Chef Run
       def run_start(version)
-        puts_line "Starting Chef Client#{" (FIPS mode)" if Chef::Config[:openssl_fips]}" \
-            ", version #{version}"
+        puts_line "Starting Chef Client, version #{version}"
+        puts_line "OpenSSL FIPS 140 mode enabled" if Chef::Config[:fips]
       end
 
       # Called at the end of the Chef run.
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index 3816857c46..4db6c22f2e 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -250,8 +250,8 @@ class Chef
           Chef::Config[:knife][:bootstrap_vault_item]
         }
 
-      option :openssl_fips,
-        :long => "--openssl-fips",
+      option :fips,
+        :long => "--fips",
         :description => "Set openssl to run in fips mode",
         :boolean => true
 
diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb
index e530d115d7..46ade9f00f 100644
--- a/lib/chef/knife/core/bootstrap_context.rb
+++ b/lib/chef/knife/core/bootstrap_context.rb
@@ -120,8 +120,8 @@ validation_client_name "#{@chef_config[:validation_client_name]}"
             client_rb << %Q{trusted_certs_dir "/etc/chef/trusted_certs"\n}
           end
 
-          if @config[:openssl_fips]
-            client_rb << %Q{openssl_fips true\n}
+          if @config[:fips]
+            client_rb << %Q{fips true\n}
           end
 
           client_rb