[Kimchi-devel] [PATCH V7 2/2] Modify vnc_proxy_port to display_proxy_port

Becasue vnc and spice are using the same port, and get the port from back-end. So this var should be changed to display_proxy_port so that it can be used by vnc and spice. Signed-off-by: zhoumeina <zhoumein(a)linux.vnet.ibm.com&gt; --- docs/API.md | 2 +- src/kimchi.conf.in | 2 +- src/kimchi/config.py.in | 2 +- src/kimchi/control/config.py | 2 +- src/kimchi/vnc.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/API.md b/docs/API.md index 6e240eb..cfcf6bb 100644 --- a/docs/API.md +++ b/docs/API.md @@ -470,7 +470,7 @@ Contains information about the application environment and configuration. * **GET**: Retrieve configuration information * http_port: The port number on which the server is listening - * vnc_proxy_port: Port for vnc's websocket proxy to listen on + * display_proxy_port: Port for vnc's websocket proxy to listen on * **POST**: *See Configuration Actions* **Actions (POST):** diff --git a/src/kimchi.conf.in b/src/kimchi.conf.in index ac5a1f5..f48901d 100644 --- a/src/kimchi.conf.in +++ b/src/kimchi.conf.in @@ -32,4 +32,4 @@ [novnc] # Port for vnc's websocket proxy to listen on -#vnc_proxy_port = 64667 +#display_proxy_port = 64667 diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index 8d9b5e1..1d97cb6 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -183,7 +183,7 @@ def _get_config(): config.set("logging", "log_dir", get_default_log_dir()) config.set("logging", "log_level", DEFAULT_LOG_LEVEL) config.add_section("novnc") - config.set("novnc", "vnc_proxy_port", "64667") + config.set("novnc", "display_proxy_port", "64667") config_file = os.path.join(get_config_dir(), 'kimchi.conf') if os.path.exists(config_file): diff --git a/src/kimchi/control/config.py b/src/kimchi/control/config.py index 5186ddd..ab43203 100644 --- a/src/kimchi/control/config.py +++ b/src/kimchi/control/config.py @@ -40,7 +40,7 @@ class Config(Resource): @property def data(self): return {'http_port': cherrypy.server.socket_port, - 'vnc_proxy_port': config.get('novnc', 'vnc_proxy_port')} + 'display_proxy_port': config.get('novnc', 'display_proxy_port')} class Capabilities(Resource): diff --git a/src/kimchi/vnc.py b/src/kimchi/vnc.py index dc70b46..f1567cf 100644 --- a/src/kimchi/vnc.py +++ b/src/kimchi/vnc.py @@ -40,7 +40,7 @@ def new_ws_proxy(): pass cmd = os.path.join(os.path.dirname(__file__), 'websockify.py') - args = ['python', cmd, config.get('novnc', 'vnc_proxy_port'), + args = ['python', cmd, config.get('novnc', 'display_proxy_port'), '--target-config', WS_TOKENS_DIR] p = subprocess.Popen(args, close_fds=True) return p -- 1.7.1