openstack
/
tripleo-common
Code Issues Proposed changes

Use https for novnc proxy healthcheck if ssl_only is configured 

If nova novnc proxy is configured to ssl only, (see LP 178570)
we need to make sure to also use ssl with the healthcheck script.
With this change we verify if ssl_only is configured in nova.conf
and set https as the proto to use for the novnc healthcheck.

With this change we verify if ssl_only is configured in nova.conf
and set https.

Change-Id: Idd96815b774b94ad5a6ffbb2af4d5b78306ddd12
Related-bug: #1785700
(cherry picked from commit e380c3f396)
This commit is contained in:
Martin Schuppert 2018-08-08 09:05:14 +02:00
parent 3a17de31f6
commit 7bf83dccb7
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
healthcheck/nova-vnc-proxy
View File

@ -4,5 +4,12 @@
bind_host=$(get_config_val /etc/nova/nova.conf vnc novncproxy_host 127.0.0.1)
bind_port=$(get_config_val /etc/nova/nova.conf vnc novncproxy_port 6080)
proto_is_ssl=$(get_config_val /etc/nova/nova.conf DEFAULT ssl_only false)
healthcheck_curl http://${bind_host}:${bind_port}/
bind_proto=http
if [ "${proto_is_ssl,,}" = true ] ; then
bind_proto=https
fi
healthcheck_curl ${bind_proto}://${bind_host}:${bind_port}/

7
releasenotes/notes/nova_novnc_proxy_ssl_healthcheck-f9ad0dffb459ef4b.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- |
If nova novnc proxy is configured to ssl only, (see LP 178570)
we need to make sure to also use ssl with the healthcheck script.
With this change we verify if ssl_only is configured in nova.conf
and set https as the proto to use for the novnc healthcheck.