diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-02-03 08:53:02 -0800 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-02-03 08:53:02 -0800 |
commit | 09227432c7a8afeac633023abbeec2e9c14cbd1b (patch) | |
tree | 811fc939d4ccdaf66b0bf6bf7cdef10bb0172191 /lib/chef/knife | |
parent | ab63cd4be967b5d01f6ec856244e4b9af4e896d9 (diff) | |
parent | d1f9d3fe01da4620c983ee9b74cbd973abbff418 (diff) | |
download | chef-09227432c7a8afeac633023abbeec2e9c14cbd1b.tar.gz |
Merge pull request #4481 from chef/jdm/fips-58
Allow use of command line fips switch for knife
Diffstat (limited to 'lib/chef/knife')
-rw-r--r-- | lib/chef/knife/bootstrap.rb | 5 | ||||
-rw-r--r-- | lib/chef/knife/core/bootstrap_context.rb | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index f01cebd9c9..a1172aefc9 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -250,11 +250,6 @@ class Chef Chef::Config[:knife][:bootstrap_vault_item] } - option :fips, - :long => "--fips", - :description => "Set openssl to run in fips mode", - :boolean => true - def initialize(argv=[]) super @client_builder = Chef::Knife::Bootstrap::ClientBuilder.new( diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb index 62ea54721a..a863e0cdb7 100644 --- a/lib/chef/knife/core/bootstrap_context.rb +++ b/lib/chef/knife/core/bootstrap_context.rb @@ -120,7 +120,7 @@ validation_client_name "#{@chef_config[:validation_client_name]}" client_rb << %Q{trusted_certs_dir "/etc/chef/trusted_certs"\n} end - if @config[:fips] + if Chef::Config[:fips] client_rb << %Q{fips true\n} end |