Merge "Use openstack.common.cfg.CONF."

6 files changed, 0 insertions, 7 deletions

diff --git a/bin/clear_rabbit_queues b/bin/clear_rabbit_queues
index c367c06c6..578681790 100755
--- a/bin/clear_rabbit_queues
+++ b/bin/clear_rabbit_queues
@@ -71,7 +71,6 @@ def delete_queues(queues):
 if __name__ == '__main__':
     args = flags.parse_args(sys.argv)
     logging.setup()
-    rpc.register_opts(flags.FLAGS)
     delete_queues(args[1:])
     if FLAGS.delete_exchange:
         delete_exchange(FLAGS.control_exchange)
diff --git a/bin/instance-usage-audit b/bin/instance-usage-audit
index 59fff1080..3d60edfec 100755
--- a/bin/instance-usage-audit
+++ b/bin/instance-usage-audit
@@ -63,7 +63,6 @@ from nova import utils
 FLAGS = flags.FLAGS
 
 if __name__ == '__main__':
-    rpc.register_opts(FLAGS)
     admin_context = context.get_admin_context()
     flags.parse_args(sys.argv)
     logging.setup()
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index 109d7101b..f30a0877e 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -99,8 +99,6 @@ def main():
     argv = flags.parse_args(sys.argv)
     logging.setup()
 
-    rpc.register_opts(FLAGS)
-
     if int(os.environ.get('TESTING', '0')):
         from nova.tests import fake_flags
 
diff --git a/bin/nova-manage b/bin/nova-manage
index 466bd9846..605e76032 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1664,7 +1664,6 @@ def methods_of(obj):
 
 def main():
     """Parse options and call the appropriate class/method."""
-    rpc.register_opts(FLAGS)
 
     try:
         argv = flags.parse_args(sys.argv)
diff --git a/bin/nova-xvpvncproxy b/bin/nova-xvpvncproxy
index d338d3a3e..bdbe20997 100755
--- a/bin/nova-xvpvncproxy
+++ b/bin/nova-xvpvncproxy
@@ -40,7 +40,6 @@ from nova.vnc import xvp_proxy
 FLAGS = flags.FLAGS
 
 if __name__ == "__main__":
-    rpc.register_opts(FLAGS)
     flags.parse_args(sys.argv)
     logging.setup()
 
diff --git a/bin/volume-usage-audit b/bin/volume-usage-audit
index 0329d184e..2c01da56f 100755
--- a/bin/volume-usage-audit
+++ b/bin/volume-usage-audit
@@ -62,7 +62,6 @@ from nova.volume import utils as volume_utils
 FLAGS = flags.FLAGS
 
 if __name__ == '__main__':
-    rpc.register_opts(FLAGS)
     admin_context = context.get_admin_context()
     utils.default_cfgfile()
     flags.FLAGS(sys.argv)