openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix freezed spice console in horizon"

Browse Source
This commit is contained in:
Zuul 2021-08-04 12:21:45 +00:00 committed by Gerrit Code Review
commit 87777b3601
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/nova-cell/defaults/main.yml
View File

@ -410,6 +410,7 @@ nova_cell_bootstrap_extra_volumes: "{{ nova_extra_volumes }}"
# HAProxy # HAProxy
#################### ####################
haproxy_nova_serialconsole_proxy_tunnel_timeout: "10m" haproxy_nova_serialconsole_proxy_tunnel_timeout: "10m"
haproxy_nova_spicehtml5_proxy_tunnel_timeout: "1h"
#################### ####################
# OpenStack # OpenStack

4
ansible/roles/nova-cell/tasks/loadbalancer.yml
View File

@ -78,12 +78,16 @@
external: false external: false
port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_port'] }}" port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_port'] }}"
listen_port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_listen_port'] }}" listen_port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_listen_port'] }}"
backend_http_extra:
- "timeout tunnel {{ haproxy_nova_spicehtml5_proxy_tunnel_timeout }}"
nova_spicehtml5proxy_external: nova_spicehtml5proxy_external:
enabled: "{{ hostvars[groups[cell_proxy_group][0]]['nova_console'] == 'spice' }}" enabled: "{{ hostvars[groups[cell_proxy_group][0]]['nova_console'] == 'spice' }}"
mode: "http" mode: "http"
external: true external: true
port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_port'] }}" port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_port'] }}"
listen_port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_listen_port'] }}" listen_port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_listen_port'] }}"
backend_http_extra:
- "timeout tunnel {{ haproxy_nova_spicehtml5_proxy_tunnel_timeout }}"
tags: always tags: always
- import_tasks: proxy_loadbalancer.yml - import_tasks: proxy_loadbalancer.yml

10
releasenotes/notes/bug-1938549-e73042a61f0a5935.yaml Normal file
View File

@ -0,0 +1,10 @@
---
features:
- |
Adds config parameter ``haproxy_nova_spicehtml5_proxy_tunnel_timeout``
to configure the ``Tunnel TimeOut`` directive for spicehtml5proxy
haproxy service.
fixes:
- |
Fixes an issue where spice console is freezed after while,
see `LP#1938549 <https://launchpad.net/bugs/1938549>`__.