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

Merge pull request #10014 from bcoca/inventory_script_errorhandle

Browse source 
ansible now captures returncode errors on inventory scripts
This commit is contained in:
Brian Coca 2015-01-19 15:17:56 -05:00
commit 23783a5228
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/inventory/script.py
View file

@ -43,6 +43,10 @@ class InventoryScript(object):
except OSError, e: except OSError, e:
raise errors.AnsibleError("problem running %s (%s)" % (' '.join(cmd), e)) raise errors.AnsibleError("problem running %s (%s)" % (' '.join(cmd), e))
(stdout, stderr) = sp.communicate() (stdout, stderr) = sp.communicate()
if sp.returncode != 0:
raise errors.AnsibleError("Inventory script (%s) had an execution error: %s " % (filename,stderr))
self.data = stdout self.data = stdout
# see comment about _meta below # see comment about _meta below
self.host_vars_from_top = None self.host_vars_from_top = None

4
v2/ansible/inventory/script.py
View file

@ -43,6 +43,10 @@ class InventoryScript(object):
except OSError, e: except OSError, e:
raise errors.AnsibleError("problem running %s (%s)" % (' '.join(cmd), e)) raise errors.AnsibleError("problem running %s (%s)" % (' '.join(cmd), e))
(stdout, stderr) = sp.communicate() (stdout, stderr) = sp.communicate()
if sp.returncode != 0:
raise errors.AnsibleError("Inventory script (%s) had an execution error: %s " % (filename,stderr))
self.data = stdout self.data = stdout
# see comment about _meta below # see comment about _meta below
self.host_vars_from_top = None self.host_vars_from_top = None