Merge pull request #11086 from krak3n/fix-master._clear_old_jobs-ext_pillar-root

Fix master._clear_old_jobs for ext_pillars with root parameter
2024-11-08 09:23:56 +00:00 · 2014-03-10 09:15:10 -07:00 · 2014-03-10 09:15:10 -07:00 · fd929044f1
commit fd929044f1
parent dc909d13c7 73098eef9b
1 changed files with 17 additions and 2 deletions
--- a/salt/master.py
+++ b/salt/master.py
@ -161,8 +161,23 @@ class Master(SMaster):
        pillargitfs = []
        for opts_dict in [x for x in self.opts.get('ext_pillar', [])]:
            if 'git' in opts_dict:
-                br, loc = opts_dict['git'].strip().split()
-                pillargitfs.append(git_pillar.GitPillar(br, loc, self.opts))
+                parts = opts_dict['git'].strip().split()
+                try:
+                    br = parts[0]
+                    loc = parts[1]
+                except IndexError:
+                    log.critical(
+                        'Unable to extract external pillar data: {0}'
+                        .format(opts_dict['git'])
+                    )
+                else:
+                    pillargitfs.append(
+                        git_pillar.GitPillar(
+                            br,
+                            loc,
+                            self.opts
+                        )
+                    )

        # Clear remote fileserver backend env cache so it gets recreated during
        # the first loop_interval