valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change error type for new dns checks

Browse Source
This commit is contained in:
Thomas S Hatch 2012-03-01 10:20:34 -07:00
parent 10cce187a4
commit 3a69744cd5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/minion.py
View File

@ -26,8 +26,7 @@ import zmq
# Import salt libs
from salt.exceptions import AuthenticationError, MinionError, \
CommandExecutionError, CommandNotFoundError, SaltInvocationError, \
SaltMasterError
CommandExecutionError, CommandNotFoundError, SaltInvocationError
import salt.client
import salt.crypt
import salt.loader
@ -76,7 +75,7 @@ def safe_dns_check(addr):
'now fails to resolve! The previously resolved ip addr '
'will continue to be used').format(addr)
log.error(err)
raise SaltMasterError
raise SaltClientError
class SMinion(object):
@ -455,7 +454,7 @@ class Minion(object):
try:
# Verify that the dns entry has not changed
self.opts['master_ip'] = safe_dns_check()
except SaltMasterError:
except SaltClientError:
# Failed to update the dns, keep the old addr
pass
self.passive_refresh()