Use cfg's new global CONF object

Implements blueprint cfg-global-object

Replace nova.flags.FLAGS with openstack.common.cfg.CONF.

In future, we can do a s/FLAGS/CONF/ across the codebase.

Change-Id: Ib293873089a5399febd7a3b0410f66e9bef115f1

19 files changed, 33 insertions, 56 deletions

diff --git a/bin/clear_rabbit_queues b/bin/clear_rabbit_queues
index 37394add6..1912046b6 100755
--- a/bin/clear_rabbit_queues
+++ b/bin/clear_rabbit_queues
@@ -46,7 +46,6 @@ from nova import flags
 from nova import log as logging
 from nova.openstack.common import cfg
 from nova import rpc
-from nova import utils
 
 
 delete_exchange_opt = \
@@ -71,8 +70,7 @@ def delete_queues(queues):
         x.queue_delete(q)
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    args = flags.FLAGS(sys.argv)
+    args = flags.parse_args(sys.argv)
     logging.setup()
     rpc.register_opts(flags.FLAGS)
     delete_queues(args[1:])
diff --git a/bin/instance-usage-audit b/bin/instance-usage-audit
index 3db812bda..59fff1080 100755
--- a/bin/instance-usage-audit
+++ b/bin/instance-usage-audit
@@ -65,8 +65,7 @@ FLAGS = flags.FLAGS
 if __name__ == '__main__':
     rpc.register_opts(FLAGS)
     admin_context = context.get_admin_context()
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     begin, end = utils.last_completed_audit_period()
     print "Starting instance usage audit"
diff --git a/bin/nova-all b/bin/nova-all
index 529d98ed0..57e84b0dd 100755
--- a/bin/nova-all
+++ b/bin/nova-all
@@ -51,8 +51,7 @@ from nova.vnc import xvp_proxy
 LOG = logging.getLogger('nova.all')
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     servers = []
diff --git a/bin/nova-api b/bin/nova-api
index 7a601c3a6..e6779df4f 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -42,8 +42,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     servers = []
diff --git a/bin/nova-api-ec2 b/bin/nova-api-ec2
index e1a1549c7..b53c9158a 100755
--- a/bin/nova-api-ec2
+++ b/bin/nova-api-ec2
@@ -38,8 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     server = service.WSGIService('ec2')
diff --git a/bin/nova-api-metadata b/bin/nova-api-metadata
index c4ca541f4..2f2ef9454 100755
--- a/bin/nova-api-metadata
+++ b/bin/nova-api-metadata
@@ -38,8 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     server = service.WSGIService('metadata')
diff --git a/bin/nova-api-os-compute b/bin/nova-api-os-compute
index 9c49815fe..75c921943 100755
--- a/bin/nova-api-os-compute
+++ b/bin/nova-api-os-compute
@@ -38,8 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     server = service.WSGIService('osapi_compute')
diff --git a/bin/nova-api-os-volume b/bin/nova-api-os-volume
index 21d5dc3de..b93fd51ae 100755
--- a/bin/nova-api-os-volume
+++ b/bin/nova-api-os-volume
@@ -38,8 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     server = service.WSGIService('osapi_volume')
diff --git a/bin/nova-cert b/bin/nova-cert
index f6a5cbbd8..a845c1055 100755
--- a/bin/nova-cert
+++ b/bin/nova-cert
@@ -38,8 +38,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     server = service.Service.create(binary='nova-cert')
diff --git a/bin/nova-compute b/bin/nova-compute
index 8f7e9177d..bef7bce86 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -40,8 +40,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     server = service.Service.create(binary='nova-compute')
diff --git a/bin/nova-console b/bin/nova-console
index 06e352f48..f5a760b37 100755
--- a/bin/nova-console
+++ b/bin/nova-console
@@ -36,11 +36,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 from nova import flags
 from nova import log as logging
 from nova import service
-from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     server = service.Service.create(binary='nova-console')
     service.serve(server)
diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth
index 9c566cb7c..71d77b285 100755
--- a/bin/nova-consoleauth
+++ b/bin/nova-consoleauth
@@ -35,12 +35,10 @@ from nova.consoleauth import manager
 from nova import flags
 from nova import log as logging
 from nova import service
-from nova import utils
 
 
 if __name__ == "__main__":
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
 
     server = service.Service.create(binary='nova-consoleauth')
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index fab334bf5..c11947da2 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -96,8 +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_cfgfile(flagfile)
-    argv = FLAGS(sys.argv)
+    argv = flags.parse_args(sys.argv)
     logging.setup()
 
     rpc.register_opts(FLAGS)
diff --git a/bin/nova-manage b/bin/nova-manage
index a4eaf9d6b..f0d54d814 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -87,6 +87,7 @@ from nova.db import migration
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova import quota
 from nova import rpc
@@ -1668,26 +1669,24 @@ def methods_of(obj):
 
 def main():
     """Parse options and call the appropriate class/method."""
-    cfgfile = utils.default_cfgfile()
-
-    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:
-            print 'sudo failed, continuing as if nothing happened'
-
     rpc.register_opts(FLAGS)
 
     try:
-        argv = FLAGS(sys.argv)
+        argv = flags.parse_args(sys.argv)
         logging.setup()
-    except IOError, e:
-        if e.errno == errno.EACCES:
-            print _('Please re-run nova-manage as root.')
-            sys.exit(2)
-        raise
+    except cfg.ConfigFilesNotFoundError:
+        cfgfile = FLAGS.config_file[-1] if FLAGS.config_file else None
+        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:
+                print _('sudo failed, continuing as if nothing happened')
+
+        print _('Please re-run nova-manage as root.')
+        sys.exit(2)
+
     script_name = argv.pop(0)
     if len(argv) < 1:
         print _("\nOpenStack Nova version: %(version)s (%(vcs)s)\n") % \
diff --git a/bin/nova-network b/bin/nova-network
index d176eb27c..306eddafa 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -40,8 +40,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     server = service.Service.create(binary='nova-network')
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index e52160c25..e9bd0f42d 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -42,8 +42,7 @@ from nova import utils
 
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     server = s3server.get_wsgi_server()
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index 52db4de7e..fb803ab5b 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -42,8 +42,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     server = service.Service.create(binary='nova-scheduler')
diff --git a/bin/nova-volume b/bin/nova-volume
index 1c6ffb58f..d8c13b9a6 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -40,8 +40,7 @@ from nova import service
 from nova import utils
 
 if __name__ == '__main__':
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
     utils.monkey_patch()
     server = service.Service.create(binary='nova-volume')
diff --git a/bin/nova-xvpvncproxy b/bin/nova-xvpvncproxy
index 9db07f148..d338d3a3e 100755
--- a/bin/nova-xvpvncproxy
+++ b/bin/nova-xvpvncproxy
@@ -35,15 +35,13 @@ from nova import flags
 from nova import log as logging
 from nova import rpc
 from nova import service
-from nova import utils
 from nova.vnc import xvp_proxy
 
 FLAGS = flags.FLAGS
 
 if __name__ == "__main__":
     rpc.register_opts(FLAGS)
-    utils.default_cfgfile()
-    flags.FLAGS(sys.argv)
+    flags.parse_args(sys.argv)
     logging.setup()
 
     wsgi_server = xvp_proxy.get_wsgi_server()