summaryrefslogtreecommitdiff
path: root/lib/chef/knife
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2016-01-22 08:15:24 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2016-01-25 09:53:44 -0800
commit74f32edd28ab18508440061e2b16020f03812589 (patch)
treea76c1f68bb7644824812dcb2872e5e7c78c83961 /lib/chef/knife
parent64c2dd07e01fae18aac742dd01dee5c8c996954f (diff)
downloadchef-74f32edd28ab18508440061e2b16020f03812589.tar.gz
Rename openssl-fips to fips and add messages
Diffstat (limited to 'lib/chef/knife')
-rw-r--r--lib/chef/knife/bootstrap.rb4
-rw-r--r--lib/chef/knife/core/bootstrap_context.rb4
2 files changed, 4 insertions, 4 deletions
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