From e9fd01e58b6a83b400ce9825f2543cb6ef476f00 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Sat, 4 Feb 2012 00:02:41 +0100
Subject: Re-run nova-manage under sudo if unable to read conffile

Having to manually sudo to the nova user to make things work is
tedious. Make it so that if we can't read the conffile, we just
re-exec under sudo.

Fixes bug 805695

Change-Id: I322cece80ca757c69147fb3f8474ad137d9bff82
---
 nova/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/utils.py b/nova/utils.py
index 72e1cd3e0..c93b48fc6 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -325,7 +325,7 @@ def default_flagfile(filename='nova.conf', args=None):
         args = sys.argv
     for arg in args:
         if arg.find('flagfile') != -1:
-            break
+            return arg[arg.index('flagfile') + 1:]
     else:
         if not os.path.isabs(filename):
             # turn relative filename into an absolute path
@@ -338,6 +338,7 @@ def default_flagfile(filename='nova.conf', args=None):
         if os.path.exists(filename):
             flagfile = '--flagfile=%s' % filename
             args.insert(1, flagfile)
+            return filename
 
 
 def debug(arg):
-- 
cgit