Merge "Remove the last of the gflags shim layer"

3 files changed, 3 insertions, 3 deletions

diff --git a/bin/clear_rabbit_queues b/bin/clear_rabbit_queues
index 9d0d803a5..503fa07d8 100755
--- a/bin/clear_rabbit_queues
+++ b/bin/clear_rabbit_queues
@@ -55,7 +55,7 @@ delete_exchange_opt = \
                 help='delete nova exchange too.')
 
 FLAGS = flags.FLAGS
-FLAGS.add_option(delete_exchange_opt)
+FLAGS.register_cli_opt(delete_exchange_opt)
 
 
 def delete_exchange(exch):
diff --git a/bin/nova-direct-api b/bin/nova-direct-api
index 6a79ef626..121a0b45c 100755
--- a/bin/nova-direct-api
+++ b/bin/nova-direct-api
@@ -57,7 +57,7 @@ direct_api_opts = [
     ]
 
 FLAGS = flags.FLAGS
-FLAGS.add_options(direct_api_opts)
+FLAGS.register_cli_opts(direct_api_opts)
 
 
 # An example of an API that only exposes read-only methods.
diff --git a/bin/nova-manage b/bin/nova-manage
index 6b15dea63..adf2e2530 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -2201,7 +2201,7 @@ class ConfigCommands(object):
         pass
 
     def list(self):
-        for key, value in FLAGS.FlagValuesDict().iteritems():
+        for key, value in FLAGS.iteritems():
             if value is not None:
                 print '%s = %s' % (key, value)