Merge branch 'devel' of https://github.com/drybjed/ansible into drybjed-devel

2013-09-23 15:10:40 -05:00 · 2013-09-23 15:10:40 -05:00 · 104535ac48
commit 104535ac48
parent 65180fa530 669b345937
1 changed files with 7 additions and 0 deletions
--- a/system/setup
+++ b/system/setup
@ -1904,6 +1904,13 @@ class LinuxVirtual(Virtual):
                self.facts['virtualization_role'] = 'guest'
            return

+        if os.path.exists('/proc/1/cgroup'):
+            for line in open('/proc/1/cgroup').readlines():
+                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']: