Merge "Switch from FLAGS to CONF in misc modules"

nova/common/eventlet_backdoor.py

@@ -25,6 +25,7 @@ import eventlet
 import eventlet.backdoor
 import greenlet
 
+from nova import config
 from nova import flags
 from nova.openstack.common import cfg
 
@@ -34,8 +35,8 @@ eventlet_backdoor_opts = [
                help='port for eventlet backdoor to listen')
     ]
 
-FLAGS = flags.FLAGS
+CONF = config.CONF
-FLAGS.register_opts(eventlet_backdoor_opts)
+CONF.register_opts(eventlet_backdoor_opts)
 
 
 def dont_use_this():
@@ -62,7 +63,7 @@ backdoor_locals = {
 
 
 def initialize_if_enabled():
-    if FLAGS.backdoor_port is None:
+    if CONF.backdoor_port is None:
         return
 
     # NOTE(johannes): The standard sys.displayhook will print the value of
@@ -76,5 +77,5 @@ def initialize_if_enabled():
     sys.displayhook = displayhook
 
     eventlet.spawn(eventlet.backdoor.backdoor_server,
-                   eventlet.listen(('localhost', FLAGS.backdoor_port)),
+                   eventlet.listen(('localhost', CONF.backdoor_port)),
                    locals=backdoor_locals)

nova/flags.py

@@ -30,10 +30,11 @@ import os
 import socket
 import sys
 
+from nova import config
 from nova.openstack.common import cfg
 
-
+CONF = config.CONF
-FLAGS = cfg.CONF
+FLAGS = CONF
 
 
 def _get_my_ip():
@@ -88,8 +89,8 @@ debug_opts = [
                help='Add python stack traces to SQL as comment strings'),
 ]
 
-FLAGS.register_cli_opts(core_opts)
+CONF.register_cli_opts(core_opts)
-FLAGS.register_cli_opts(debug_opts)
+CONF.register_cli_opts(debug_opts)
 
 global_opts = [
     cfg.StrOpt('my_ip',
@@ -376,4 +377,4 @@ global_opts = [
                    'vmwareapi.VMWareESXDriver'),
 ]
 
-FLAGS.register_opts(global_opts)
+CONF.register_opts(global_opts)