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
48a0236e
Commit
48a0236e
authored
Aug 08, 2014
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6619 from sergevanginderachter/ansible_version_var
Introduce an ansible_version dict as runner variable
parents
5c46a39c
d240e2b9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
0 deletions
+30
-0
lib/ansible/playbook/__init__.py
+3
-0
lib/ansible/runner/__init__.py
+3
-0
lib/ansible/utils/__init__.py
+24
-0
No files found.
lib/ansible/playbook/__init__.py
View file @
48a0236e
...
...
@@ -181,6 +181,8 @@ class PlayBook(object):
ansible
.
callbacks
.
load_callback_plugins
()
ansible
.
callbacks
.
set_playbook
(
self
.
callbacks
,
self
)
self
.
_ansible_version
=
utils
.
version_info
(
gitinfo
=
True
)
# *****************************************************
def
_get_playbook_vars
(
self
,
play_ds
,
existing_vars
):
...
...
@@ -409,6 +411,7 @@ class PlayBook(object):
)
runner
.
module_vars
.
update
({
'play_hosts'
:
hosts
})
runner
.
module_vars
.
update
({
'ansible_version'
:
self
.
_ansible_version
})
if
task
.
async_seconds
==
0
:
results
=
runner
.
run
()
...
...
lib/ansible/runner/__init__.py
View file @
48a0236e
...
...
@@ -622,6 +622,9 @@ class Runner(object):
if
self
.
inventory
.
src
()
is
not
None
:
inject
[
'inventory_file'
]
=
self
.
inventory
.
src
()
# could be already set by playbook code
inject
.
setdefault
(
'ansible_version'
,
utils
.
version_info
(
gitinfo
=
False
))
# allow with_foo to work in playbooks...
items
=
None
items_plugin
=
self
.
module_vars
.
get
(
'items_lookup_plugin'
,
None
)
...
...
lib/ansible/utils/__init__.py
View file @
48a0236e
...
...
@@ -804,6 +804,30 @@ def version(prog):
result
=
result
+
" {0}"
.
format
(
gitinfo
)
return
result
def
version_info
(
gitinfo
=
False
):
if
gitinfo
:
# expensive call, user with care
ansible_version_string
=
version
(
''
)
else
:
ansible_version_string
=
__version__
ansible_version
=
ansible_version_string
.
split
()[
0
]
ansible_versions
=
ansible_version
.
split
(
'.'
)
for
counter
in
range
(
len
(
ansible_versions
)):
if
ansible_versions
[
counter
]
==
""
:
ansible_versions
[
counter
]
=
0
try
:
ansible_versions
[
counter
]
=
int
(
ansible_versions
[
counter
])
except
:
pass
if
len
(
ansible_versions
)
<
3
:
for
counter
in
range
(
len
(
ansible_versions
),
3
):
ansible_versions
.
append
(
0
)
return
{
'string'
:
ansible_version_string
.
strip
(),
'full'
:
ansible_version
,
'major'
:
ansible_versions
[
0
],
'minor'
:
ansible_versions
[
1
],
'revision'
:
ansible_versions
[
2
]}
def
getch
():
''' read in a single character '''
fd
=
sys
.
stdin
.
fileno
()
...
...
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