Merge pull request #1542 from arrfab/xen-fact-issue

Fixed the way dom0/domU xen role is defined in the setup module
2012-11-07 04:05:38 -08:00 · 2012-11-07 04:05:38 -08:00 · 7cd013f854
commit 7cd013f854
parent 1b8d912d2a 29882f97e6
1 changed files with 5 additions and 4 deletions
--- a/library/setup
+++ b/library/setup
@ -711,11 +711,12 @@ class LinuxVirtual(Virtual):
    def get_virtual_facts(self):
        if os.path.exists("/proc/xen"):
            self.facts['virtualization_type'] = 'xen'
+            self.facts['virtualization_role'] = 'guest'
            if os.path.exists('/proc/xen/capabilities'):
-                self.facts['virtualization_role'] = 'host'
-            else:
-                self.facts['virtualization_role'] = 'guest'
-
+                for line in open('/proc/xen/capabilities'):
+                    if "control_d" in line:
+                        self.facts['virtualization_role'] = 'host'
+                    
        elif os.path.exists('/proc/vz'):
            self.facts['virtualization_type'] = 'openvz'
            if os.path.exists('/proc/vz/version'):