Merge lp:~ttx/nova/lp847768 into lp:~hudson-openstack/nova/milestone-proposed

[Thierry Carrez]

Fixes rogue usage of sudo that crept in

Fixes rogue usage of sudo that crept in since all sudo calls were abstracted using run_as_root=True (and the root_helper flag).

The one in tests was actually fixed to match what Vish pushed in rev1546 (those don't use sudo anymore).

=== modified file 'nova/tests/test_libvirt.py'
--- nova/tests/test_libvirt.py	2011-09-09 09:24:28 +0000
+++ nova/tests/test_libvirt.py	2011-09-13 12:48:38 +0000
@@ -743,7 +743,7 @@
         # qemu-img should be mockd since test environment might not have
         # large disk space.
         self.mox.StubOutWithMock(utils, "execute")
-        utils.execute('sudo', 'qemu-img', 'create', '-f', 'raw',
+        utils.execute('qemu-img', 'create', '-f', 'raw',
                       '%s/%s/disk' % (tmpdir, instance_ref.name), '10G')
 
         self.mox.ReplayAll()
@@ -795,7 +795,7 @@
         os.path.getsize("/test/disk").AndReturn(10 * 1024 * 1024 * 1024)
         # another is qcow image, so qemu-img should be mocked.
         self.mox.StubOutWithMock(utils, "execute")
-        utils.execute('sudo', 'qemu-img', 'info', '/test/disk.local').\
+        utils.execute('qemu-img', 'info', '/test/disk.local').\
             AndReturn((ret, ''))
 
         self.mox.ReplayAll()
 
=== modified file 'nova/virt/disk.py'
--- nova/virt/disk.py	2011-09-12 14:19:19 +0000
+++ nova/virt/disk.py	2011-09-13 12:48:38 +0000
@@ -229,8 +229,8 @@
     metadata_path = os.path.join(fs, "meta.js")
     metadata = dict([(m.key, m.value) for m in metadata])
 
-    utils.execute('sudo', 'tee', metadata_path,
-                  process_input=json.dumps(metadata))
+    utils.execute('tee', metadata_path,
+                  process_input=json.dumps(metadata), run_as_root=True)
 
 
 def _inject_key_into_fs(key, fs, execute=None):