From d1888a3359345acffd8d0845c137eefd88072112 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Fri, 3 Feb 2012 00:50:58 +0000
Subject: Remove the last of the gflags shim layer

Make FLAGS a ConfigOpts instance and fix up all the places where we
expected FlagValues behaviour.

Change-Id: I8f96f42e0d8d30ba6b362d29861e717cf0fa9e89
---
 nova/consoleauth/__init__.py | 2 +-
 nova/consoleauth/manager.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/consoleauth')

diff --git a/nova/consoleauth/__init__.py b/nova/consoleauth/__init__.py
index 0ef313d05..5923aa0c8 100644
--- a/nova/consoleauth/__init__.py
+++ b/nova/consoleauth/__init__.py
@@ -27,4 +27,4 @@ consoleauth_topic_opt = cfg.StrOpt('consoleauth_topic',
         help='the topic console auth proxy nodes listen on')
 
 FLAGS = flags.FLAGS
-FLAGS.add_option(consoleauth_topic_opt)
+FLAGS.register_opt(consoleauth_topic_opt)
diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py
index b3f85e1f9..0fd1a9caf 100644
--- a/nova/consoleauth/manager.py
+++ b/nova/consoleauth/manager.py
@@ -41,7 +41,7 @@ consoleauth_opts = [
     ]
 
 FLAGS = flags.FLAGS
-FLAGS.add_options(consoleauth_opts)
+FLAGS.register_opts(consoleauth_opts)
 
 
 class ConsoleAuthManager(manager.Manager):
-- 
cgit