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
45f98007
Commit
45f98007
authored
Sep 30, 2015
by
Linus Unnebäck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
facts: correctly detect docker inside a xen host
parent
af1f462b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
lib/ansible/module_utils/facts.py
+11
-11
No files found.
lib/ansible/module_utils/facts.py
View file @
45f98007
...
...
@@ -2582,6 +2582,17 @@ class LinuxVirtual(Virtual):
# For more information, check: http://people.redhat.com/~rjones/virt-what/
def
get_virtual_facts
(
self
):
if
os
.
path
.
exists
(
'/proc/1/cgroup'
):
for
line
in
get_file_lines
(
'/proc/1/cgroup'
):
if
re
.
search
(
r'/docker(/|-[0-9a-f]+\.scope)'
,
line
):
self
.
facts
[
'virtualization_type'
]
=
'docker'
self
.
facts
[
'virtualization_role'
]
=
'guest'
return
if
re
.
search
(
'/lxc/'
,
line
):
self
.
facts
[
'virtualization_type'
]
=
'lxc'
self
.
facts
[
'virtualization_role'
]
=
'guest'
return
if
os
.
path
.
exists
(
"/proc/xen"
):
self
.
facts
[
'virtualization_type'
]
=
'xen'
self
.
facts
[
'virtualization_role'
]
=
'guest'
...
...
@@ -2607,17 +2618,6 @@ class LinuxVirtual(Virtual):
self
.
facts
[
'virtualization_role'
]
=
'guest'
return
if
os
.
path
.
exists
(
'/proc/1/cgroup'
):
for
line
in
get_file_lines
(
'/proc/1/cgroup'
):
if
re
.
search
(
r'/docker(/|-[0-9a-f]+\.scope)'
,
line
):
self
.
facts
[
'virtualization_type'
]
=
'docker'
self
.
facts
[
'virtualization_role'
]
=
'guest'
return
if
re
.
search
(
'/lxc/'
,
line
):
self
.
facts
[
'virtualization_type'
]
=
'lxc'
self
.
facts
[
'virtualization_role'
]
=
'guest'
return
product_name
=
get_file_content
(
'/sys/devices/virtual/dmi/id/product_name'
)
if
product_name
in
[
'KVM'
,
'Bochs'
]:
...
...
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