From c520403cbdb29574fa94b2436d2f0b59a167bbee Mon Sep 17 00:00:00 2001
From: Brian Elliott <brian.elliott@rackspace.com>
Date: Fri, 26 Oct 2012 10:17:35 +0000
Subject: [PATCH] Make nova-rootwrap optional

Make the use of nova-rootwrap optional if the current process's
effective user id is already root.

Change-Id: I2cf5c743c6f4d6f235a54ca70c11d8191deeed6a
---
 nova/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/utils.py b/nova/utils.py
index 01df19b277fc..26637a48956d 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -160,7 +160,7 @@ def execute(*cmd, **kwargs):
         raise exception.NovaException(_('Got unknown keyword args '
                                         'to utils.execute: %r') % kwargs)
 
-    if run_as_root:
+    if run_as_root and os.geteuid() != 0:
         cmd = ['sudo', 'nova-rootwrap', FLAGS.rootwrap_config] + list(cmd)
 
     cmd = map(str, cmd)