From 916fcdb93b0c1f8d353377fdd9401f609eab3e9f Mon Sep 17 00:00:00 2001
From: Ahmad Khayyat <akhayyat@gmail.com>
Date: Sat, 11 Aug 2012 08:33:43 -0400
Subject: [PATCH] Add openvz detection to virtualization facts, and some cleanup
---
library/setup | 43 ++++++++++++++++++++++++-------------------
1 file changed, 24 insertions(+), 19 deletions(-)
diff --git a/library/setup b/library/setup
index d4b73f4..93eefc1 100755
--- a/library/setup
+++ b/library/setup
@@ -563,10 +563,31 @@ 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"):
+ if os.path.exists('/proc/xen/capabilities'):
+ self.facts['virtualization_role'] = 'host'
+ else:
+ self.facts['virtualization_role'] = 'guest'
+
+ elif os.path.exists('/proc/vz'):
+ self.facts['virtualization_type'] = 'openvz'
+ if os.path.exists('/proc/vz/version'):
self.facts['virtualization_role'] = 'host'
- if os.path.exists("/proc/modules"):
+ else:
+ self.facts['virtualization_role'] = 'guest'
+
+ elif get_file_content('/sys/devices/virtual/dmi/id/product_name') in ['KVM','Bochs']:
+ self.facts['virtualization_type'] = 'kvm'
+ self.facts['virtualization_role'] = 'guest'
+
+ elif get_file_content('/sys/devices/virtual/dmi/id/sys_vendor') == 'VMware, Inc.':
+ self.facts['virtualization_type'] = 'VMware'
+ self.facts['virtualization_role'] = 'guest'
+
+ elif get_file_content('/sys/devices/virtual/dmi/id/sys_vendor') == 'Microsoft Corporation':
+ self.facts['virtualization_type'] = 'VirtualPC'
+ self.facts['virtualization_role'] = 'guest'
+
+ elif os.path.exists("/proc/modules"):
modules = []
for line in open("/proc/modules").readlines():
data = line.split(" ", 1)
@@ -580,22 +601,6 @@ class LinuxVirtual(Virtual):
elif 'vboxguest' in modules:
self.facts['virtualization_type'] = 'virtualbox'
self.facts['virtualization_role'] = 'guest'
- data = get_file_content('/proc/cpuinfo')
- if 'QEMU' in data:
- self.facts['virtualization_type'] = 'kvm'
- self.facts['virtualization_role'] = 'guest'
- if 'distribution' in self.facts and self.facts['distribution'] == 'VMwareESX':
- self.facts['virtualization_type'] = 'VMware'
- self.facts['virtualization_role'] = 'host'
- # You can spawn a dmidecode process and parse that or infer from devices
- for dev_model in glob.glob('/sys/block/?da/device/vendor'):
- info = open(dev_model).read()
- if 'VMware' in info:
- self.facts['virtualization_type'] = 'VMware'
- self.facts['virtualization_role'] = 'guest'
- elif 'Virtual HD' in info or 'Virtual CD' in info:
- self.facts['virtualization_type'] = 'VirtualPC'
- self.facts['virtualization_role'] = 'guest'
def get_file_content(path):
data = None
--
libgit2 0.26.0