ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge branch 'devel' of github.com:ansible/ansible into devel

Browse source
This commit is contained in:
Michael DeHaan 2013-07-22 15:16:47 -04:00
commit 86f05f11e7
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,8 +58,12 @@ class ActionModule(object):
data = {} data = {}
data.update(inject) data.update(inject)
data.update(inject['hostvars'][host]) data.update(inject['hostvars'][host])
if not check_conditional(self.runner.basedir, self.runner.conditional, data, fail_on_undefined=self.runner.error_on_undefined_vars): conds = self.runner.conditional
continue if type(conds) != list:
conds = [ conds ]
for cond in conds:
if not check_conditional(cond, self.runner.basedir, data, fail_on_undefined=self.runner.error_on_undefined_vars):
continue
group_name = template.template(self.runner.basedir, args['key'], data) group_name = template.template(self.runner.basedir, args['key'], data)
group_name = group_name.replace(' ','-') group_name = group_name.replace(' ','-')
if group_name not in groups: if group_name not in groups:

2
lib/ansible/runner/lookup_plugins/flattened.py
View file

@ -71,7 +71,7 @@ class LookupModule(object):
terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject) terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject)
if not isinstance(terms, list): if not isinstance(terms, list):
raise errors.AnsibleError("with_flat_list expects a list") raise errors.AnsibleError("with_flattened expects a list")
ret = self.flatten(terms, inject) ret = self.flatten(terms, inject)
return ret return ret

5
library/system/setup
View file

@ -633,10 +633,7 @@ class LinuxHardware(Hardware):
size_total = statvfs_result.f_bsize * statvfs_result.f_blocks size_total = statvfs_result.f_bsize * statvfs_result.f_blocks
size_available = statvfs_result.f_bsize * (statvfs_result.f_bavail) size_available = statvfs_result.f_bsize * (statvfs_result.f_bavail)
except OSError, e: except OSError, e:
if e.errno == errno.ENOENT: continue
pass
else:
self.fail_json(msg=e.strerror)
self.facts['mounts'].append( self.facts['mounts'].append(
{'mount': fields[1], {'mount': fields[1],