cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'group-by-global' of git://github.com/stoned/ansible into devel

Browse source 
Conflicts:
	lib/ansible/runner/action_plugins/group_by.py
This commit is contained in:
Michael DeHaan 2013-05-11 14:28:04 -04:00
commit 05a4513a03
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/runner/action_plugins/group_by.py
View file

@ -55,11 +55,9 @@ class ActionModule(object):
groups = {} groups = {}
for host in self.runner.host_set: for host in self.runner.host_set:
if not check_conditional(template.template(self.runner.basedir, self.runner.conditional, inject)):
data = inject['hostvars'][host]
if not check_conditional(template.template(self.runner.basedir, self.runner.conditional, data)):
continue 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(' ','-') group_name = group_name.replace(' ','-')
if group_name not in groups: if group_name not in groups:
groups[group_name] = [] groups[group_name] = []