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
8c3b5690
Commit
8c3b5690
authored
Mar 13, 2015
by
Toshio Kuratomi
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10357 from htgoebel/devel
Fix detect of docker as virtualization_type.
parents
c2a87a20
8758ae20
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
lib/ansible/module_utils/facts.py
+1
-1
No files found.
lib/ansible/module_utils/facts.py
View file @
8c3b5690
...
@@ -2383,7 +2383,7 @@ class LinuxVirtual(Virtual):
...
@@ -2383,7 +2383,7 @@ class LinuxVirtual(Virtual):
if
os
.
path
.
exists
(
'/proc/1/cgroup'
):
if
os
.
path
.
exists
(
'/proc/1/cgroup'
):
for
line
in
get_file_lines
(
'/proc/1/cgroup'
):
for
line
in
get_file_lines
(
'/proc/1/cgroup'
):
if
re
.
search
(
'/docker/
'
,
line
):
if
re
.
search
(
r'/docker(/|-[0-9a-f]+\.scope)
'
,
line
):
self
.
facts
[
'virtualization_type'
]
=
'docker'
self
.
facts
[
'virtualization_type'
]
=
'docker'
self
.
facts
[
'virtualization_role'
]
=
'guest'
self
.
facts
[
'virtualization_role'
]
=
'guest'
return
return
...
...
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