Merge "Remove old flagfile support."

bin/clear_rabbit_queues

@@ -71,7 +71,7 @@ def delete_queues(queues):
         x.queue_delete(q)
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     args = flags.FLAGS(sys.argv)
     logging.setup()
     rpc.register_opts(flags.FLAGS)

bin/instance-usage-audit

@@ -65,7 +65,7 @@ FLAGS = flags.FLAGS
 if __name__ == '__main__':
     rpc.register_opts(FLAGS)
     admin_context = context.get_admin_context()
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     begin, end = utils.last_completed_audit_period()

bin/nova-all

@@ -51,7 +51,7 @@ from nova.vnc import xvp_proxy
 LOG = logging.getLogger('nova.all')
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-api

@@ -42,7 +42,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-api-ec2

@@ -38,7 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-api-metadata

@@ -38,7 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-api-os-compute

@@ -38,7 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-api-os-volume

@@ -38,7 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-cert

@@ -38,7 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-compute

@@ -40,7 +40,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-console

@@ -39,7 +39,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     server = service.Service.create(binary='nova-console')

bin/nova-consoleauth

@@ -39,7 +39,7 @@ from nova import utils
 
 
 if __name__ == "__main__":
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
 

bin/nova-dhcpbridge

@@ -96,7 +96,7 @@ def init_leases(network_id):
 def main():
     """Parse environment and arguments and call the approproate action."""
     flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile)
-    utils.default_flagfile(flagfile)
+    utils.default_cfgfile(flagfile)
     argv = FLAGS(sys.argv)
     logging.setup()
 

bin/nova-manage

@@ -1666,11 +1666,11 @@ def methods_of(obj):
 
 def main():
     """Parse options and call the appropriate class/method."""
-    flagfile = utils.default_flagfile()
+    cfgfile = utils.default_cfgfile()
 
-    if flagfile and not os.access(flagfile, os.R_OK):
-        st = os.stat(flagfile)
-        print "Could not read %s. Re-running with sudo" % flagfile
+    if cfgfile and not os.access(cfgfile, os.R_OK):
+        st = os.stat(cfgfile)
+        print "Could not read %s. Re-running with sudo" % cfgfile
         try:
             os.execvp('sudo', ['sudo', '-u', '#%s' % st.st_uid] + sys.argv)
         except Exception:

bin/nova-network

@@ -40,7 +40,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-objectstore

@@ -42,7 +42,7 @@ from nova import utils
 
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-scheduler

@@ -42,7 +42,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-volume

@@ -40,7 +40,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()

bin/nova-xvpvncproxy

@@ -42,7 +42,7 @@ FLAGS = flags.FLAGS
 
 if __name__ == "__main__":
     rpc.register_opts(FLAGS)
-    utils.default_flagfile()
+    utils.default_cfgfile()
     flags.FLAGS(sys.argv)
     logging.setup()
 

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()

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')