c55edcf0e1
The config options of the "nova.conf" section "serial_console"
got moved to the new central location "nova/conf/serial_console.py".
The way the centralization is done establishes a directed non-cyclic
dependency:
functional-module (e.g. virt.libvirt.driver.py)
=> nova.conf.__init__.py
=> section_module (e.g. nova.conf.serial_console.py)
Which makes me believe that the "import_opt" calls are not necessary to
ensure that the proper module gets imported under the cover. That's why
I removed these "import_opt" calls. bp centralize-config-options
A subsequent patch will then improve the help texts.
bp centralize-config-options
Change-Id: I597f427455e976892f60262cc823be3946c83e88
40 lines
1.1 KiB
Python
40 lines
1.1 KiB
Python
# 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
|
|
Serial consoles. Leverages websockify.py by Joel Martin.
|
|
Based on nova-novncproxy.
|
|
"""
|
|
import sys
|
|
|
|
from nova.cmd import baseproxy
|
|
import nova.conf
|
|
from nova.conf import serial_console as serial
|
|
from nova import config
|
|
|
|
|
|
CONF = nova.conf.CONF
|
|
serial.register_cli_opts(CONF)
|
|
|
|
|
|
def main():
|
|
# set default web flag option
|
|
CONF.set_default('web', None)
|
|
config.parse_args(sys.argv)
|
|
|
|
baseproxy.proxy(
|
|
host=CONF.serial_console.serialproxy_host,
|
|
port=CONF.serial_console.serialproxy_port)
|