saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

avoid KeyError in ping_master

Browse source
This commit is contained in:
Jorge Schrauwen 2016-06-25 12:17:28 +02:00
parent 81d7fc98d8
commit 25678901fa
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/status.py
View file

@ -838,7 +838,7 @@ def master(master=None, connected=True):
Fire an event if the minion gets disconnected from its master. This
function is meant to be run via a scheduled job from the minion. If
master_ip is an FQDN/Hostname, is must be resolvable to a valid IPv4
master_ip is an FQDN/Hostname, it must be resolvable to a valid IPv4
address.
CLI Example:
@ -893,7 +893,8 @@ def ping_master(master):
opts = copy.deepcopy(__opts__)
opts['master'] = master
del opts['master_ip'] # avoid 'master ip changed' warning
if 'master_ip' in opts: # avoid 'master ip changed' warning
del opts['master_ip']
opts.update(salt.minion.prep_ip_port(opts))
try:
opts.update(salt.minion.resolve_dns(opts, fallback=False))