Merge "Remove old flagfile support."

1 files changed, 5 insertions, 5 deletions

diff --git a/nova/utils.py b/nova/utils.py
index 9577ff269..af55bdb2e 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -284,12 +284,12 @@ def novadir():
     return os.path.abspath(nova.__file__).split('nova/__init__.py')[0]
 
 
-def default_flagfile(filename='nova.conf', args=None):
+def default_cfgfile(filename='nova.conf', args=None):
     if args is None:
         args = sys.argv
     for arg in args:
-        if arg.find('flagfile') != -1:
-            return arg[arg.index('flagfile') + len('flagfile') + 1:]
+        if arg.find('config-file') != -1:
+            return arg[arg.index('config-file') + len('config-file') + 1:]
     else:
         if not os.path.isabs(filename):
             # turn relative filename into an absolute path
@@ -300,8 +300,8 @@ def default_flagfile(filename='nova.conf', args=None):
             if not os.path.exists(filename):
                 filename = '/etc/nova/nova.conf'
         if os.path.exists(filename):
-            flagfile = '--flagfile=%s' % filename
-            args.insert(1, flagfile)
+            cfgfile = '--config-file=%s' % filename
+            args.insert(1, cfgfile)
             return filename