openstack/nova
Code Issues Proposed changes

Merge "Allow configuring proxy_host and proxy_port in nova.conf"

Browse Source
This commit is contained in:
Jenkins
2015-03-03 22:28:46 +00:00
committed by Gerrit Code Review
parent 5dcd8063fc 8f060f07c7
commit fc329beade
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/cmd/baseproxy.py
View File

@@ -23,7 +23,6 @@ import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from nova import config
from nova.console import websocketproxy from nova.console import websocketproxy
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import version from nova import version
@@ -44,8 +43,6 @@ def exit_with_error(msg, errno=-1):
def proxy(host, port): def proxy(host, port):
# Setup flags
config.parse_args(sys.argv)
if CONF.ssl_only and not os.path.exists(CONF.cert): if CONF.ssl_only and not os.path.exists(CONF.cert):
exit_with_error("SSL only and %s not found" % CONF.cert) exit_with_error("SSL only and %s not found" % CONF.cert)

4
nova/cmd/novncproxy.py
View File

@@ -18,9 +18,12 @@ Websocket proxy that is compatible with OpenStack Nova
noVNC consoles. Leverages websockify.py by Joel Martin noVNC consoles. Leverages websockify.py by Joel Martin
""" """
import sys
from oslo_config import cfg from oslo_config import cfg
from nova.cmd import baseproxy from nova.cmd import baseproxy
from nova import config
opts = [ opts = [
@@ -39,6 +42,7 @@ CONF.register_cli_opts(opts)
def main(): def main():
# set default web flag option # set default web flag option
CONF.set_default('web', '/usr/share/novnc') CONF.set_default('web', '/usr/share/novnc')
config.parse_args(sys.argv)
baseproxy.proxy( baseproxy.proxy(
host=CONF.novncproxy_host, host=CONF.novncproxy_host,

3
nova/cmd/serialproxy.py
View File

@@ -17,10 +17,12 @@ Websocket proxy that is compatible with OpenStack Nova
Serial consoles. Leverages websockify.py by Joel Martin. Serial consoles. Leverages websockify.py by Joel Martin.
Based on nova-novncproxy. Based on nova-novncproxy.
""" """
import sys
from oslo_config import cfg from oslo_config import cfg
from nova.cmd import baseproxy from nova.cmd import baseproxy
from nova import config
opts = [ opts = [
@@ -39,6 +41,7 @@ CONF.register_cli_opts(opts, group="serial_console")
def main(): def main():
# set default web flag option # set default web flag option
CONF.set_default('web', None) CONF.set_default('web', None)
config.parse_args(sys.argv)
baseproxy.proxy( baseproxy.proxy(
host=CONF.serial_console.serialproxy_host, host=CONF.serial_console.serialproxy_host,

4
nova/cmd/spicehtml5proxy.py
View File

@@ -18,9 +18,12 @@ Websocket proxy that is compatible with OpenStack Nova
SPICE HTML5 consoles. Leverages websockify.py by Joel Martin SPICE HTML5 consoles. Leverages websockify.py by Joel Martin
""" """
import sys
from oslo_config import cfg from oslo_config import cfg
from nova.cmd import baseproxy from nova.cmd import baseproxy
from nova import config
opts = [ opts = [
@@ -37,6 +40,7 @@ CONF.register_cli_opts(opts, group='spice')
def main(): def main():
config.parse_args(sys.argv)
baseproxy.proxy( baseproxy.proxy(
host=CONF.spice.html5proxy_host, host=CONF.spice.html5proxy_host,