Access to zun container fails when tls_external enabled.

Access to console of any zun container fails when
kolla_enable_tls_external is true.
This is due to the protocol of the base_url of the websocket_proxy
section in zun.conf is hardcoded to 'ws'.
[base_url = ws://<external_fqdn>:<port>]

This fix adds a new variable zun_wsproxy_protocol
and sets it's value to 'wss' when kolla_enable_tls_external is true
or to 'ws' otherwise

Then the base url's protocol of the websocket_proxy section
in zun.conf is set by zun_wsproxy_protocol
[base_url = "{{ zun_wsproxy_protocol }}://<external_fqdn>:<port>"]

Closes-Bug: 1957117
Change-Id: Ibd9ca6e40ee8c265775b0657d318aa3f82e4cccb
This commit is contained in:
Buddhika Sanjeewa 2022-01-11 22:21:00 +00:00
parent 9bbba35b2f
commit d8c73aa206
3 changed files with 13 additions and 1 deletions

View File

@ -521,6 +521,7 @@ zookeeper_quorum_port: "3888"
zun_api_port: "9517"
zun_wsproxy_port: "6784"
zun_wsproxy_protocol: "{{ 'wss' if kolla_enable_tls_external | bool else 'ws' }}"
zun_cni_daemon_port: "9036"
vitrage_api_port: "8999"

View File

@ -118,7 +118,7 @@ host_shared_with_nova = {{ inventory_hostname in groups['compute'] and enable_no
[websocket_proxy]
wsproxy_host = {{ api_interface_address }}
wsproxy_port = {{ zun_wsproxy_port }}
base_url = ws://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ zun_wsproxy_port }}
base_url = {{ zun_wsproxy_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ zun_wsproxy_port }}
[docker]
api_url = tcp://{{ api_interface_address | put_address_in_context('url') }}:2375

View File

@ -0,0 +1,11 @@
---
fixes:
- |
Fixes unable to connect to zun console when
``kolla_enable_tls_external`` is true.
Access to console of any zun container fails when
``kolla_enable_tls_external`` is true.
This fix sets the protocol for wsproxy ``base_url``
in ``zun.conf`` according to the value of
``kolla_enable_tls_external``
`LP#1957117 <https://launchpad.net/bugs/1957117>`__