Merge pull request #15378 from dsumsky/salt-minion-multi-master-bug-2

salt minion multi-master exception bug
saltstack · Aug 29, 2014 · 3def0e4 · 3def0e4
2 parents 6bd722c + 4ec1417
commit 3def0e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -38,7 +38,7 @@ htmlcov/
 /.project
 /.pydevproject
 /.idea
-/.ropeproject
+.ropeproject
 
 # ignore ctags file
 tags

diff --git a/salt/minion.py b/salt/minion.py
@@ -370,6 +370,10 @@ def _gen_minions(self):
                 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):