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/compute/api.py     | 2 +-
 nova/compute/manager.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 240e924fe..926f5e3cc 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -55,7 +55,7 @@ find_host_timeout_opt = cfg.StrOpt('find_host_timeout',
         help='Timeout after NN seconds when looking for a host.')
 
 FLAGS = flags.FLAGS
-FLAGS.add_option(find_host_timeout_opt)
+FLAGS.register_opt(find_host_timeout_opt)
 flags.DECLARE('enable_zone_routing', 'nova.scheduler.api')
 flags.DECLARE('consoleauth_topic', 'nova.consoleauth')
 
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 47448eb13..dbcb64c21 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -119,7 +119,7 @@ compute_opts = [
     ]
 
 FLAGS = flags.FLAGS
-FLAGS.add_options(compute_opts)
+FLAGS.register_opts(compute_opts)
 
 LOG = logging.getLogger('nova.compute.manager')
 
-- 
cgit