Commit 86f05f11 by Michael DeHaan

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

parents a35370a7 fc9aa5f0
...@@ -58,8 +58,12 @@ class ActionModule(object): ...@@ -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:
......
...@@ -71,7 +71,7 @@ class LookupModule(object): ...@@ -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
......
...@@ -633,10 +633,7 @@ class LinuxHardware(Hardware): ...@@ -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],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment