Skip to content

Commit dacddd8

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Fix freezed spice console in horizon" into stable/wallaby
2 parents cbda3c3 + bbdee7a commit dacddd8

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

ansible/roles/nova-cell/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ nova_cell_bootstrap_extra_volumes: "{{ nova_extra_volumes }}"
409409
# HAProxy
410410
####################
411411
haproxy_nova_serialconsole_proxy_tunnel_timeout: "10m"
412+
haproxy_nova_spicehtml5_proxy_tunnel_timeout: "1h"
412413

413414
####################
414415
# OpenStack

ansible/roles/nova-cell/tasks/loadbalancer.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,16 @@
7878
external: false
7979
port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_port'] }}"
8080
listen_port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_listen_port'] }}"
81+
backend_http_extra:
82+
- "timeout tunnel {{ haproxy_nova_spicehtml5_proxy_tunnel_timeout }}"
8183
nova_spicehtml5proxy_external:
8284
enabled: "{{ hostvars[groups[cell_proxy_group][0]]['nova_console'] == 'spice' }}"
8385
mode: "http"
8486
external: true
8587
port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_port'] }}"
8688
listen_port: "{{ hostvars[groups[cell_proxy_group][0]]['nova_spicehtml5proxy_listen_port'] }}"
89+
backend_http_extra:
90+
- "timeout tunnel {{ haproxy_nova_spicehtml5_proxy_tunnel_timeout }}"
8791
tags: always
8892

8993
- import_tasks: proxy_loadbalancer.yml
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
features:
3+
- |
4+
Adds config parameter ``haproxy_nova_spicehtml5_proxy_tunnel_timeout``
5+
to configure the ``Tunnel TimeOut`` directive for spicehtml5proxy
6+
haproxy service.
7+
fixes:
8+
- |
9+
Fixes an issue where spice console is freezed after while,
10+
see `LP#1938549 <https://launchpad.net/bugs/1938549>`__.

0 commit comments

Comments
 (0)