cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10357 from htgoebel/devel

Browse source 
Fix detect of docker as virtualization_type.
This commit is contained in:
Toshio Kuratomi 2015-03-13 11:40:15 -07:00
commit 8c3b5690e5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/facts.py
View file

@ -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