Merge pull request chef#342 from chef/revert-337-jdm/fips-flag

Revert "Add fips flag to boostrap"
hh · Jan 27, 2016 · 751fd04 · 751fd04
2 parents 4cd1453 + 1db5cfc
commit 751fd04
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/lib/chef/knife/bootstrap_windows_base.rb b/lib/chef/knife/bootstrap_windows_base.rb
@@ -200,11 +200,6 @@ def self.included(includer)
             :description => "Comma separated list of tags to apply to the node",
             :proc => lambda { |o| o.split(/[\s,]+/) },
             :default => []
-
-          option :fips,
-            :long => "--fips",
-            :description => "Set openssl to run in fips mode",
-            :boolean => true
         end
       end
 

diff --git a/lib/chef/knife/core/windows_bootstrap_context.rb b/lib/chef/knife/core/windows_bootstrap_context.rb
@@ -136,10 +136,6 @@ def config_content
             client_rb << %Q{trusted_certs_dir "c:/chef/trusted_certs"\n}
           end
 
-          if @config[:fips]
-            client_rb << %Q{fips true\n}
-          end
-
           escape_and_echo(client_rb)
         end