cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Streamline code

Browse source
This commit is contained in:
Michael DeHaan 2012-11-23 10:58:17 -05:00
parent 17020d6a75
commit 3981c72957
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
library/setup
View file

@ -776,26 +776,16 @@ class LinuxVirtual(Virtual):
for line in open('/proc/cpuinfo').readlines(): for line in open('/proc/cpuinfo').readlines():
if re.match('^model name.*QEMU Virtual CPU', line): if re.match('^model name.*QEMU Virtual CPU', line):
self.facts['virtualization_type'] = 'kvm' self.facts['virtualization_type'] = 'kvm'
self.facts['virtualization_role'] = 'guest' elif re.match('^vendor_id.*User Mode Linux', line):
return
if re.match('^vendor_id.*User Mode Linux', line):
self.facts['virtualization_type'] = 'uml' self.facts['virtualization_type'] = 'uml'
self.facts['virtualization_role'] = 'guest' elif re.match('^model name.*UML', line):
return
if re.match('^model name.*UML', line):
self.facts['virtualization_type'] = 'uml' self.facts['virtualization_type'] = 'uml'
self.facts['virtualization_role'] = 'guest' elif re.match('^vendor_id.*PowerVM Lx86', line):
return
if re.match('^vendor_id.*PowerVM Lx86', line):
self.facts['virtualization_type'] = 'powervm_lx86' self.facts['virtualization_type'] = 'powervm_lx86'
self.facts['virtualization_role'] = 'guest' elif re.match('^vendor_id.*IBM/S390', line):
return
if re.match('^vendor_id.*IBM/S390', line):
self.facts['virtualization_type'] = 'ibm_systemz' self.facts['virtualization_type'] = 'ibm_systemz'
else:
continue
self.facts['virtualization_role'] = 'guest' self.facts['virtualization_role'] = 'guest'
return return