2362970d5c
We were registering the 'remote_debug' CLI opts as part of the 'nova.conf' init code. This meant not only every service we used (bar 'nova-console') but also every CLI tool we provided was exposing these options, even though they made zero sense in the latter option. Resolve this by explicitly registering the options against the services that we want them in. Specifically, these are the API services (nova-api, nova-api-metadata, nova-api-os-compute), the console proxy services (nova-novncproxy, nova-serialproxy, nova-spicehtml5proxy), nova-compute, nova-conductor and nova-scheduler. While we're here, we also clean up the documentation for these options since there are a few non-rST'y things in there. Change-Id: I7b7489e8412cc93d49904d4ef08a775b07b27d26 Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
41 lines
1.1 KiB
Python
41 lines
1.1 KiB
Python
# Copyright (c) 2012 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""
|
|
Websocket proxy that is compatible with OpenStack Nova
|
|
SPICE HTML5 consoles. Leverages websockify.py by Joel Martin
|
|
"""
|
|
|
|
import sys
|
|
|
|
from nova.cmd import baseproxy
|
|
import nova.conf
|
|
from nova.conf import remote_debug
|
|
from nova.conf import spice
|
|
from nova import config
|
|
|
|
|
|
CONF = nova.conf.CONF
|
|
remote_debug.register_cli_opts(CONF)
|
|
spice.register_cli_opts(CONF)
|
|
|
|
|
|
def main():
|
|
config.parse_args(sys.argv)
|
|
|
|
baseproxy.proxy(
|
|
host=CONF.spice.html5proxy_host,
|
|
port=CONF.spice.html5proxy_port)
|