diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2012-11-05 18:37:38 -0800 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2012-11-05 19:19:21 -0800 |
| commit | bc0ed4c4a6637c46fbc4567fdab2ea56b5d2a06d (patch) | |
| tree | a4d8c9a54c441201b199834c561196c0debd2a05 /nova | |
| parent | 181e44c9e5327392e5b4b9da18b5ce863780a3b1 (diff) | |
| download | nova-bc0ed4c4a6637c46fbc4567fdab2ea56b5d2a06d.tar.gz nova-bc0ed4c4a6637c46fbc4567fdab2ea56b5d2a06d.tar.xz nova-bc0ed4c4a6637c46fbc4567fdab2ea56b5d2a06d.zip | |
De-duplicate option: console_public_hostname
console_public_hostname was defined in both console.manager and
vmrc_manager.
Change-Id: I377ca893a84ff60f2d289cde3eba05993e2a09b1
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/console/vmrc_manager.py | 12 |
1 files 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): |