Merge lp:~soren/nova/uml into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Just a couple of UML-only fixes:
 * Due to an issue with libvirt, we need to chown the disk image to root.
 * Just point UML's console directly at a file, and don't bother with the pty. It was only used for debugging.

[Eric Day (eday)]

Did you mean to edit the UML libvirt template instead of the qemu template? Commit messages say UML template change.

review: Needs Information

[Soren Hansen (soren)]

Blimey! You're right.

[Soren Hansen (soren)]

Please re-review. Thanks.

[Eric Day (eday)]

looks better :)

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

lgtm as well

review: Approve

=== modified file 'nova/virt/libvirt.uml.xml.template'
--- nova/virt/libvirt.uml.xml.template	2010-08-13 21:44:14 +0000
+++ nova/virt/libvirt.uml.xml.template	2010-09-01 19:01:56 +0000
@@ -15,11 +15,9 @@
             <source bridge='%(bridge_name)s'/>
             <mac address='%(mac_address)s'/>
         </interface>
-        <console type="pty" />
-        <serial type="file">
+        <console type="file">
             <source path='%(basepath)s/console.log'/>
-            <target port='1'/>
-        </serial>
+        </console>
     </devices>
     <nova>%(nova)s</nova>
 </domain>

=== modified file 'nova/virt/libvirt_conn.py'
--- nova/virt/libvirt_conn.py	2010-09-01 18:15:14 +0000
+++ nova/virt/libvirt_conn.py	2010-09-01 19:01:56 +0000
@@ -268,6 +268,9 @@
         yield disk.partition(
                 basepath('disk-raw'), basepath('disk'), bytes, execute=execute)
 
+        if FLAGS.libvirt_type == 'uml':
+            execute('sudo chown root %s' % (basepath('disk'),))
+
     def basepath(self, instance, path=''):
         return os.path.abspath(os.path.join(instance.datamodel['basepath'], path))