Merge pull request #10357 from htgoebel/devel

Fix detect of docker as virtualization_type.
This commit is contained in:
Toshio Kuratomi 2015-03-13 11:40:15 -07:00
commit 8c3b5690e5

View file

@ -2383,7 +2383,7 @@ class LinuxVirtual(Virtual):
if os.path.exists('/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_role'] = 'guest'
return