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
86f05f11
Commit
86f05f11
authored
Jul 22, 2013
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'devel' of github.com:ansible/ansible into devel
parents
a35370a7
fc9aa5f0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
lib/ansible/runner/action_plugins/group_by.py
+6
-2
lib/ansible/runner/lookup_plugins/flattened.py
+1
-1
library/system/setup
+1
-4
No files found.
lib/ansible/runner/action_plugins/group_by.py
View file @
86f05f11
...
@@ -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
:
...
...
lib/ansible/runner/lookup_plugins/flattened.py
View file @
86f05f11
...
@@ -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_flat
tened
expects a list"
)
ret
=
self
.
flatten
(
terms
,
inject
)
ret
=
self
.
flatten
(
terms
,
inject
)
return
ret
return
ret
...
...
library/system/setup
View file @
86f05f11
...
@@ -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
],
...
...
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