summaryrefslogtreecommitdiff
path: root/lib/chef/client.rb
diff options
context:
space:
mode:
authorPhil Dibowitz <phil@ipom.com>2015-01-15 14:35:36 -0800
committerPhil Dibowitz <phil@ipom.com>2015-01-15 14:40:55 -0800
commit7e09fa58fc039d5aabdb4f041c03668797479093 (patch)
tree90481a29fc0fb154c4df252ebe75077c8acaf416 /lib/chef/client.rb
parentb9e91171f6bd4ac55d62c6b9b72838fa89a1330e (diff)
downloadchef-7e09fa58fc039d5aabdb4f041c03668797479093.tar.gz
Suppress SSL warnings if I know what I'm doing
Diffstat (limited to 'lib/chef/client.rb')
-rw-r--r--lib/chef/client.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 77f63671d7..9fe45b77df 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -530,7 +530,7 @@ class Chef
end
def check_ssl_config
- if Chef::Config[:ssl_verify_mode] == :verify_none and !Chef::Config[:verify_api_cert]
+ if Chef::Config[:ssl_verify_mode] == :verify_none and !Chef::Config[:verify_api_cert] and !Chef::Config[:suppress_ssl_warnings]
Chef::Log.warn(<<-WARN)
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *