Detect docker as virtualization_type

New docker versions use "docker" in /proc/1/cgroup, which disturbs the
virtualization_type detection. So, grep for docker, in addition of
"lxc".
This commit is contained in:
Guillaume Quintard 2014-10-20 10:09:46 +02:00
parent a60fd58145
commit 895da79d87

View file

@ -2159,6 +2159,10 @@ class LinuxVirtual(Virtual):
if os.path.exists('/proc/1/cgroup'):
for line in open('/proc/1/cgroup').readlines():
if re.search('/docker/', 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'