Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
23783a52
Commit
23783a52
authored
Jan 19, 2015
by
Brian Coca
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10014 from bcoca/inventory_script_errorhandle
ansible now captures returncode errors on inventory scripts
parents
2a9d5054
6b3d0f47
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
lib/ansible/inventory/script.py
+4
-0
v2/ansible/inventory/script.py
+4
-0
No files found.
lib/ansible/inventory/script.py
View file @
23783a52
...
@@ -43,6 +43,10 @@ class InventoryScript(object):
...
@@ -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
...
...
v2/ansible/inventory/script.py
View file @
23783a52
...
@@ -43,6 +43,10 @@ class InventoryScript(object):
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment