From f1ce35d3b2886f1c797f27bf1753384db153727f Mon Sep 17 00:00:00 2001 From: Thomas Jackson Date: Fri, 12 Sep 2014 14:44:57 -0700 Subject: [PATCH] Channels already do the reauth and if you want timeouts you have to pass tries (which it didn't do before anyways) --- salt/minion.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/salt/minion.py b/salt/minion.py index 2f2682974d71..3f5ed9ec8d35 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -843,12 +843,6 @@ def _fire_master(self, data=None, tag=None, events=None, pretag=None): channel = salt.transport.Channel.factory(self.opts) try: result = channel.send(load) - except AuthenticationError: - log.info("AES key changed, re-authenticating") - self.authenticate() - except SaltReqTimeoutError: - log.info("Master failed to respond. Preforming re-authenticating") - self.authenticate() except Exception: log.info("fire_master failed: {0}".format(traceback.format_exc()))