Merge pull request #36757 from cachedout/issue_33841

Resolve issue with minion failing to restart on failure
This commit is contained in:
Mike Place 2016-10-05 16:02:58 +09:00 committed by GitHub
commit c126f2e132

View file

@ -960,6 +960,7 @@ class Minion(MinionBase):
return True
except salt.exceptions.SaltReqTimeoutError:
log.info('fire_master failed: master could not be contacted. Request timed out.')
return False
except Exception:
log.info('fire_master failed: {0}'.format(traceback.format_exc()))
return False