scottk/openstack-helm
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/openstack-helm.git synced 2026-01-09 00:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Nova: Don't set console server_proxyclient_address as null"

Browse Source
This commit is contained in:
Zuul
2018-05-09 02:11:49 +00:00
committed by Gerrit Code Review
parent 3aeba707e3 970b38e564
commit 0117c1434c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/templates/bin/_nova-console-compute-init.sh.tpl
View File

@@ -21,7 +21,7 @@ set -ex
console_kind="{{- .Values.console.console_kind -}}"
if [ "${console_kind}" == "novnc" ] ; then
client_address="{{- .Values.conf.nova.vnc.server_proxyclient_address -}}"
client_address="{{- .Values.conf.nova.vnc.vncserver_proxyclient_address -}}"
client_interface="{{- .Values.console.novnc.compute.server_proxyclient_interface -}}"
listen_ip="{{- .Values.conf.nova.vnc.server_listen -}}"
elif [ "${console_kind}" == "spice" ] ; then

8
nova/values.yaml
View File

@@ -1028,13 +1028,13 @@ conf:
vnc:
novncproxy_host: 0.0.0.0
vncserver_listen: 0.0.0.0
# leave blank, this should be set by each compute nodes's ip
vncserver_proxyclient_address: null
# This would be set by each compute nodes's ip
# vncserver_proxyclient_address: 127.0.0.1
spice:
html5proxy_host: 0.0.0.0
server_listen: 0.0.0.0
# leave blank, this should be set by each compute nodes's ip
server_proxyclient_address: null
# This would be set by each compute nodes's ip
# server_proxyclient_address: 127.0.0.1
conductor:
workers: 1
oslo_policy: