Merge pull request #535 from choria-io/533.1

(#533) ensure the context isn't used when ssl is disabled
choria-legacy · Nov 22, 2018 · 54a8210 · 54a8210
2 parents 460b810 + cfd6263
commit 54a8210
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/lib/mcollective/connector/nats.rb b/lib/mcollective/connector/nats.rb
@@ -71,10 +71,7 @@ def connect
           :max_reconnect_attempts => -1,
           :reconnect_time_wait => 1,
           :dont_randomize_servers => !choria.randomize_middleware_servers?,
-          :name => @config.identity,
-          :tls => {
-            :context => choria.ssl_context
-          }
+          :name => @config.identity
         }
 
         if $choria_unsafe_disable_nats_tls # rubocop:disable Style/GlobalVars