Merge lp:~julian-edwards/maas/1.2-ipmi-backport into lp:maas/1.2

[Julian Edwards]

backport r1461 from trunk: Improve detect_ipmi to avoid trying to detect IPMI if host is a virtual CPU

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata	2013-02-27 15:43:02 +0000
+++ contrib/preseeds_v2/enlist_userdata	2013-05-28 01:48:35 +0000
@@ -63,7 +63,13 @@
    import json
 
    def detect_ipmi():
-       # TODO: Detection could be improved.
+       # XXX: andreserl 2013-04-09 bug=1064527: Try to detect if node
+       # is a Virtual Machine. If it is, do not try to detect IPMI.
+       with open('/proc/cpuinfo', 'r') as cpuinfo:
+           for line in cpuinfo:
+               if line.startswith('model name') and 'QEMU' in line:
+                   return (False, None)
+
        (status, output) = commands.getstatusoutput('ipmi-locate')
        show_re = re.compile('(IPMI\ Version:) (\d\.\d)')
        res = show_re.search(output)
 
=== modified file 'etc/maas/commissioning-user-data'
--- etc/maas/commissioning-user-data	2013-02-27 15:43:02 +0000
+++ etc/maas/commissioning-user-data	2013-05-28 01:48:35 +0000
@@ -220,7 +220,13 @@
 import time
 
 def detect_ipmi():
-    # TODO: Detection could be improved.
+    # XXX: andreserl 2013-04-09 bug=1064527: Try to detect if node
+    # is a Virtual Machine. If it is, do not try to detect IPMI.
+    with open('/proc/cpuinfo', 'r') as cpuinfo:
+        for line in cpuinfo:
+            if line.startswith('model name') and 'QEMU' in line:
+                return (False, None)
+
     (status, output) = commands.getstatusoutput('ipmi-locate')
     show_re = re.compile('(IPMI\ Version:) (\d\.\d)')
     res = show_re.search(output)