Merge "Remove old flagfile support."

3 files changed, 6 insertions, 40 deletions

diff --git a/nova/flags.py b/nova/flags.py
index 83a3c8535..337dc979c 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -30,7 +30,6 @@ import os
 import socket
 import sys
 
-from nova.compat import flagfile
 from nova.openstack.common import cfg
 
 
@@ -43,8 +42,7 @@ class NovaConfigOpts(cfg.CommonConfigOpts):
         self.disable_interspersed_args()
 
     def __call__(self, argv):
-        with flagfile.handle_flagfiles_managed(argv[1:]) as args:
-            return argv[:1] + super(NovaConfigOpts, self).__call__(args)
+        return argv[:1] + super(NovaConfigOpts, self).__call__(argv[1:])
 
 
 FLAGS = NovaConfigOpts()
diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py
index 153db953a..c980e522a 100644
--- a/nova/tests/test_flags.py
+++ b/nova/tests/test_flags.py
@@ -99,38 +99,6 @@ class FlagsTestCase(test.TestCase):
         self.reset_flags()
         self.assertEqual(FLAGS.flags_unittest, 'foo')
 
-    def test_flagfile(self):
-        opts = [
-            cfg.StrOpt('string', default='default', help='desc'),
-            cfg.IntOpt('int', default=1, help='desc'),
-            cfg.BoolOpt('false', default=False, help='desc'),
-            cfg.BoolOpt('true', default=True, help='desc'),
-            cfg.MultiStrOpt('multi', default=['blaa'], help='desc'),
-            ]
-
-        self.FLAGS.register_opts(opts)
-
-        (fd, path) = tempfile.mkstemp(prefix='nova', suffix='.flags')
-
-        try:
-            os.write(fd, '--string=foo\n--int=2\n--false\n--notrue\n')
-            os.write(fd, '--multi=bar\n')
-            os.close(fd)
-
-            self.FLAGS(['flags_test', '--flagfile=' + path])
-
-            self.assertEqual(self.FLAGS.string, 'foo')
-            self.assertEqual(self.FLAGS.int, 2)
-            self.assertEqual(self.FLAGS.false, True)
-            self.assertEqual(self.FLAGS.true, False)
-            self.assertEqual(self.FLAGS.multi, ['bar'])
-
-            # Re-parse to test multistring isn't append multiple times
-            self.FLAGS(['flags_test', '--flagfile=' + path])
-            self.assertEqual(self.FLAGS.multi, ['bar'])
-        finally:
-            os.remove(path)
-
     def test_defaults(self):
         self.FLAGS.register_opt(cfg.StrOpt('foo', default='bar', help='desc'))
         self.assertEqual(self.FLAGS.foo, 'bar')
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