From bc0ed4c4a6637c46fbc4567fdab2ea56b5d2a06d Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Mon, 5 Nov 2012 18:37:38 -0800
Subject: De-duplicate option: console_public_hostname

console_public_hostname was defined in both console.manager and
vmrc_manager.

Change-Id: I377ca893a84ff60f2d289cde3eba05993e2a09b1
---
 nova/console/vmrc_manager.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/nova/console/vmrc_manager.py b/nova/console/vmrc_manager.py
index 219119724..e654780a3 100644
--- a/nova/console/vmrc_manager.py
+++ b/nova/console/vmrc_manager.py
@@ -29,17 +29,9 @@ from nova.virt.vmwareapi import driver as vmwareapi_conn
 
 LOG = logging.getLogger(__name__)
 
-vmrc_manager_opts = [
-    cfg.StrOpt('console_public_hostname',
-               default='',
-               help='Publicly visible name for this console host'),
-    cfg.StrOpt('console_driver',
-               default='nova.console.vmrc.VMRCConsole',
-               help='Driver to use for the console'),
-    ]
-
 FLAGS = flags.FLAGS
-FLAGS.register_opts(vmrc_manager_opts)
+flags.DECLARE('console_driver', 'nova.console.manager')
+flags.DECLARE('console_public_hostname', 'nova.console.manager')
 
 
 class ConsoleVMRCManager(manager.Manager):
-- 
cgit