openstack/openstack-helm
Code Issues Proposed changes

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
commit 0117c1434c
2 changed files with 5 additions and 5 deletions
Show Stats 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 -}}" console_kind="{{- .Values.console.console_kind -}}"
if [ "${console_kind}" == "novnc" ] ; then 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 -}}" client_interface="{{- .Values.console.novnc.compute.server_proxyclient_interface -}}"
listen_ip="{{- .Values.conf.nova.vnc.server_listen -}}" listen_ip="{{- .Values.conf.nova.vnc.server_listen -}}"
elif [ "${console_kind}" == "spice" ] ; then elif [ "${console_kind}" == "spice" ] ; then

8
nova/values.yaml
View File

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