706a137005
The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b4 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Add dependency_links to setup.py so that oslo-config can be installed from the tarball URL specified in pip-requires. Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Make tools/hacking.py include oslo in IMPORT_EXCEPTIONS like it already does for paste. It turns out imp.find_module() doesn't correct handle namespace packages. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
97 lines
3.4 KiB
Python
Executable File
97 lines
3.4 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright (c) 2012 OpenStack, LLC.
|
|
# 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 os
|
|
import sys
|
|
|
|
from oslo.config import cfg
|
|
|
|
from nova import config
|
|
from nova.console import websocketproxy
|
|
|
|
|
|
opts = [
|
|
cfg.BoolOpt('record',
|
|
default=False,
|
|
help='Record sessions to FILE.[session_number]'),
|
|
cfg.BoolOpt('daemon',
|
|
default=False,
|
|
help='Become a daemon (background process)'),
|
|
cfg.BoolOpt('ssl_only',
|
|
default=False,
|
|
help='Disallow non-encrypted connections'),
|
|
cfg.BoolOpt('source_is_ipv6',
|
|
default=False,
|
|
help='Source is ipv6'),
|
|
cfg.StrOpt('cert',
|
|
default='self.pem',
|
|
help='SSL certificate file'),
|
|
cfg.StrOpt('key',
|
|
default=None,
|
|
help='SSL key file (if separate from cert)'),
|
|
cfg.StrOpt('web',
|
|
default='/usr/share/spice-html5',
|
|
help='Run webserver on same port. Serve files from DIR.'),
|
|
cfg.StrOpt('spicehtml5proxy_host',
|
|
default='0.0.0.0',
|
|
help='Host on which to listen for incoming requests'),
|
|
cfg.IntOpt('spicehtml5proxy_port',
|
|
default=6082,
|
|
help='Port on which to listen for incoming requests'),
|
|
]
|
|
|
|
CONF = cfg.CONF
|
|
CONF.register_cli_opts(opts)
|
|
CONF.import_opt('debug', 'nova.openstack.common.log')
|
|
|
|
|
|
if __name__ == '__main__':
|
|
if CONF.ssl_only and not os.path.exists(CONF.cert):
|
|
parser.error("SSL only and %s not found" % CONF.cert)
|
|
|
|
# Setup flags
|
|
config.parse_args(sys.argv)
|
|
|
|
# Check to see if spice html/js/css files are present
|
|
if not os.path.exists(CONF.web):
|
|
print "Can not find spice html/js/css files at %s." % CONF.web
|
|
sys.exit(-1)
|
|
|
|
# Create and start the NovaWebSockets proxy
|
|
server = websocketproxy.NovaWebSocketProxy(
|
|
listen_host=CONF.spicehtml5proxy_host,
|
|
listen_port=CONF.spicehtml5proxy_port,
|
|
source_is_ipv6=CONF.source_is_ipv6,
|
|
verbose=CONF.verbose,
|
|
cert=CONF.cert,
|
|
key=CONF.key,
|
|
ssl_only=CONF.ssl_only,
|
|
daemon=CONF.daemon,
|
|
record=CONF.record,
|
|
web=CONF.web,
|
|
target_host='ignore',
|
|
target_port='ignore',
|
|
wrap_mode='exit',
|
|
wrap_cmd=None)
|
|
server.start_server()
|