Merge lp:~smoser/utah/trunk.xenial-cleanups into lp:utah

[Scott Moser]

[Max Brustkern (nuclearbob)]

Looks good.

review: Approve

=== modified file 'conf/utah/default-vm.xml'
--- conf/utah/default-vm.xml	2012-07-11 18:01:21 +0000
+++ conf/utah/default-vm.xml	2016-02-04 16:30:14 +0000
@@ -35,7 +35,7 @@
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
+  <on_crash>destroy</on_crash><!-- this could also be 'preserve' -->
   <devices>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>

=== modified file 'utah/process.py'
--- utah/process.py	2014-07-10 14:58:45 +0000
+++ utah/process.py	2016-02-04 16:30:14 +0000
@@ -30,6 +30,13 @@
 
 from utah import logger
 
+def get_pid_list():
+    try:
+        # psutil versions > 2
+        return psutil.pids()
+    except AttributeError:
+        return psutil.get_pid_list()
+
 
 def pid_in_use(pid, arg_patterns=None):
     """Test if the given pid is running.
@@ -80,7 +87,7 @@
         :rtype: bool
 
         """
-        pids = psutil.get_pid_list()
+        pids = get_pid_list()
         cmdlines = []
         for pid in pids:
             try:

=== modified file 'utah/provisioning/vm.py'
--- utah/provisioning/vm.py	2015-09-22 22:03:50 +0000
+++ utah/provisioning/vm.py	2016-02-04 16:30:14 +0000
@@ -387,6 +387,7 @@
         source = ElementTree.Element('source')
         source.set('path', self.syslog)
         serial.append(source)
+        serial.append('append', 'on')
         target = ElementTree.Element('target')
         target.set('port', '0')
         serial.append(target)