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

Merge pull request #15526 from basepi/fp-15378

Browse Source 
Forward-port #15378 to 2014.7
This commit is contained in:
Thomas S Hatch 2014-09-04 15:04:29 -06:00
commit 47cdefa33b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -39,6 +39,7 @@ htmlcov/
/.pydevproject
/.idea
/.ropeproject
.ropeproject
/*.iml
*.sublime-project
*.sublime-workspace

4
salt/minion.py
View File

@ -469,6 +469,10 @@ class MultiMinion(MinionBase):
minions.append(Minion(s_opts, 5, False))
except SaltClientError as exc:
log.error('Error while bringing up minion for multi-master. Is master at {0} responding?'.format(master))
if len(minions) == 0:
err = 'Error while bringing up minion for multi-master. All configured masters [{0}] are not responding!!!'.format(", ".join(map(str, set(self.opts['master']))))
log.error(err)
raise SaltClientError(err)
return minions
def minions(self):