summaryrefslogtreecommitdiffstats
path: root/nova/console
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-02-03 00:50:58 +0000
committerMark McLoughlin <markmc@redhat.com>2012-02-10 06:31:56 +0000
commitd1888a3359345acffd8d0845c137eefd88072112 (patch)
tree9fc7502d4feefa603dbf7435b6f11599b255bcc1 /nova/console
parent5ad971810aaedcf5c9efd1b56add0e23921899ae (diff)
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
Diffstat (limited to 'nova/console')
-rw-r--r--nova/console/manager.py2
-rw-r--r--nova/console/vmrc.py2
-rw-r--r--nova/console/vmrc_manager.py2
-rw-r--r--nova/console/xvp.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/nova/console/manager.py b/nova/console/manager.py
index a181ee437..99ef58d89 100644
--- a/nova/console/manager.py
+++ b/nova/console/manager.py
@@ -41,7 +41,7 @@ console_manager_opts = [
]
FLAGS = flags.FLAGS
-FLAGS.add_options(console_manager_opts)
+FLAGS.register_opts(console_manager_opts)
class ConsoleProxyManager(manager.Manager):
diff --git a/nova/console/vmrc.py b/nova/console/vmrc.py
index ead53d086..b0a8ff4bc 100644
--- a/nova/console/vmrc.py
+++ b/nova/console/vmrc.py
@@ -36,7 +36,7 @@ vmrc_opts = [
]
FLAGS = flags.FLAGS
-FLAGS.add_options(vmrc_opts)
+FLAGS.register_opts(vmrc_opts)
class VMRCConsole(object):
diff --git a/nova/console/vmrc_manager.py b/nova/console/vmrc_manager.py
index 161499830..5be937eed 100644
--- a/nova/console/vmrc_manager.py
+++ b/nova/console/vmrc_manager.py
@@ -39,7 +39,7 @@ vmrc_manager_opts = [
]
FLAGS = flags.FLAGS
-FLAGS.add_options(vmrc_manager_opts)
+FLAGS.register_opts(vmrc_manager_opts)
class ConsoleVMRCManager(manager.Manager):
diff --git a/nova/console/xvp.py b/nova/console/xvp.py
index 35e57f086..1ee24338f 100644
--- a/nova/console/xvp.py
+++ b/nova/console/xvp.py
@@ -50,7 +50,7 @@ xvp_opts = [
]
FLAGS = flags.FLAGS
-FLAGS.add_options(xvp_opts)
+FLAGS.register_opts(xvp_opts)
class XVPConsoleProxy(object):