Prevent zun-wsproxy binding to all IP addresses

This issue is preventing metal upgrade jobs for
victoria->master from deploying haproxy correctly following the
merge of https://review.opendev.org/769142/.

This is intended to be a minimal patch to fix the binding
so that it can be backported in order to fix the upgrades.

Change-Id: I1c3dcbc21bee1bf6c66c9c2f77c4ff832db49f19
This commit is contained in:
Andrew Bonney 2020-12-16 14:59:26 +00:00
parent 5179acca54
commit 154ecfe25a
3 changed files with 18 additions and 2 deletions

View File

@ -182,6 +182,12 @@ zun_kuryr_service_username: kuryr
## Keystone authentication middleware
zun_keystone_auth_plugin: password
## Zun WebSocket Proxy
zun_wsproxy_proto: "{{ (openstack_service_publicuri_proto | default('http') == 'https') | ternary('wss', 'ws') }}"
zun_wsproxy_port: 6784
zun_wsproxy_host: "{{ openstack_service_bind_address | default('0.0.0.0') }}"
zun_wsproxy_base_uri: "{{ zun_wsproxy_proto }}://{{ external_lb_vip_address }}:{{ zun_wsproxy_port }}"
## Zun v1
zun_service_name: zun
zun_service_type: container

View File

@ -124,8 +124,10 @@ host_shared_with_nova = {{ inventory_hostname in groups['nova_compute'] }}
[websocket_proxy]
wsproxy_host = 0.0.0.0
wsproxy_port = 6784
base_url = {{ zun_wsproxy_base_uri }}
wsproxy_host = {{ zun_wsproxy_host }}
wsproxy_port = {{ zun_wsproxy_port }}
[zun_client]
endpoint_type = {{ zun_service_endpoint_type }}

View File

@ -20,3 +20,11 @@
- openstack-ansible-deploy-aio_metal-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
check:
jobs:
- openstack-ansible-upgrade-aio_metal-ubuntu-focal:
voting: false
gate:
jobs:
- openstack-ansible-upgrade-aio_metal-ubuntu-focal:
voting: false