openstack/openstack-helm
Code Issues Proposed changes

Nova: Don't set console server_proxyclient_address as null

Browse Source 
This PS make server_proxyclient_address to use default values on other
pods except console-proxy pod and nova-compute pods.
Until Ocata version, null value was acceptable. But from Pike version,
occurs error.

Change-Id: I4ef4ed78f4ca0ee456c20b8bfd53956030388760
Closes-Bug: #1769842
This commit is contained in:
Jawon Choo 2018-05-08 17:45:14 +09:00
parent 91eaa01652
commit 970b38e564
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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
@ -58,4 +58,4 @@ cat <<EOF>/tmp/pod-shared/nova-spice.ini
server_proxyclient_address = $client_address
server_listen = $listen_ip
EOF
fi
fi

8
nova/values.yaml
View File

@ -1027,13 +1027,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: