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
f976d47f
Commit
f976d47f
authored
Mar 20, 2015
by
Brian Coca
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10508 from ebastos/devel
correctly identifies oracle linux
parents
d4ebe775
d4eddabb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletions
+9
-1
lib/ansible/module_utils/facts.py
+9
-1
No files found.
lib/ansible/module_utils/facts.py
View file @
f976d47f
...
...
@@ -87,7 +87,8 @@ class Facts(object):
_I386RE
=
re
.
compile
(
r'i([3456]86|86pc)'
)
# For the most part, we assume that platform.dist() will tell the truth.
# This is the fallback to handle unknowns or exceptions
OSDIST_LIST
=
(
(
'/etc/redhat-release'
,
'RedHat'
),
OSDIST_LIST
=
(
(
'/etc/oracle-release'
,
'Oracle Linux'
),
(
'/etc/redhat-release'
,
'RedHat'
),
(
'/etc/vmware-release'
,
'VMwareESX'
),
(
'/etc/openwrt_release'
,
'OpenWrt'
),
(
'/etc/system-release'
,
'OtherLinux'
),
...
...
@@ -287,6 +288,13 @@ class Facts(object):
# Once we determine the value is one of these distros
# we trust the values are always correct
break
elif
name
==
'Oracle Linux'
:
data
=
get_file_content
(
path
)
if
'Oracle Linux'
in
data
:
self
.
facts
[
'distribution'
]
=
name
else
:
self
.
facts
[
'distribution'
]
=
data
.
split
()[
0
]
break
elif
name
==
'RedHat'
:
data
=
get_file_content
(
path
)
if
'Red Hat'
in
data
:
...
...
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