Merge branch 'group-by-global' of git://github.com/stoned/ansible into devel
Conflicts: lib/ansible/runner/action_plugins/group_by.py
This commit is contained in:
commit
05a4513a03
1 changed files with 2 additions and 4 deletions
|
@ -55,11 +55,9 @@ class ActionModule(object):
|
|||
groups = {}
|
||||
|
||||
for host in self.runner.host_set:
|
||||
|
||||
data = inject['hostvars'][host]
|
||||
if not check_conditional(template.template(self.runner.basedir, self.runner.conditional, data)):
|
||||
if not check_conditional(template.template(self.runner.basedir, self.runner.conditional, inject)):
|
||||
continue
|
||||
group_name = template.template(self.runner.basedir, args['key'], data)
|
||||
group_name = template.template(self.runner.basedir, args['key'], inject)
|
||||
group_name = group_name.replace(' ','-')
|
||||
if group_name not in groups:
|
||||
groups[group_name] = []
|
||||
|
|
Loading…
Reference in a new issue