Skip to content

Commit 52afd1b

Browse files
committed
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 (cherry picked from commit d8c73aa)
1 parent b3c26ae commit 52afd1b

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

ansible/group_vars/all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@ zookeeper_quorum_port: "3888"
526526

527527
zun_api_port: "9517"
528528
zun_wsproxy_port: "6784"
529+
zun_wsproxy_protocol: "{{ 'wss' if kolla_enable_tls_external | bool else 'ws' }}"
529530
zun_cni_daemon_port: "9036"
530531

531532
vitrage_api_port: "8999"

ansible/roles/zun/templates/zun.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ host_shared_with_nova = {{ inventory_hostname in groups['compute'] and enable_no
118118
[websocket_proxy]
119119
wsproxy_host = {{ api_interface_address }}
120120
wsproxy_port = {{ zun_wsproxy_port }}
121-
base_url = ws://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ zun_wsproxy_port }}
121+
base_url = {{ zun_wsproxy_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ zun_wsproxy_port }}
122122

123123
[docker]
124124
api_url = tcp://{{ api_interface_address | put_address_in_context('url') }}:2375
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes unable to connect to zun console when
5+
``kolla_enable_tls_external`` is true.
6+
Access to console of any zun container fails when
7+
``kolla_enable_tls_external`` is true.
8+
This fix sets the protocol for wsproxy ``base_url``
9+
in ``zun.conf`` according to the value of
10+
``kolla_enable_tls_external``
11+
`LP#1957117 <https://launchpad.net/bugs/1957117>`__

0 commit comments

Comments
 (0)