openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make tunnel timeout for nova_serialconsole_proxy configurable"

Browse Source
This commit is contained in:
Zuul 2018-10-31 21:08:09 +00:00 committed by Gerrit Code Review
commit 952ca2dcc5
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/roles/nova/defaults/main.yml
View File

@ -183,11 +183,15 @@ nova_services:
mode: "http" mode: "http"
external: false external: false
port: "{{ nova_serialproxy_port }}" port: "{{ nova_serialproxy_port }}"
backend_http_extra:
- "timeout tunnel {{ haproxy_nova_serialconsole_proxy_tunnel_timeout }}"
nova_serialconsole_proxy_external: nova_serialconsole_proxy_external:
enabled: "{{ enable_nova|bool and enable_nova_serialconsole_proxy|bool }}" enabled: "{{ enable_nova|bool and enable_nova_serialconsole_proxy|bool }}"
mode: "http" mode: "http"
external: true external: true
port: "{{ nova_serialproxy_port }}" port: "{{ nova_serialproxy_port }}"
backend_http_extra:
- "timeout tunnel {{ haproxy_nova_serialconsole_proxy_tunnel_timeout }}"
nova-conductor: nova-conductor:
container_name: "nova_conductor" container_name: "nova_conductor"
group: "nova-conductor" group: "nova-conductor"
@ -342,6 +346,11 @@ nova_conductor_dimensions: "{{ default_container_dimensions }}"
nova_compute_dimensions: "{{ default_container_dimensions }}" nova_compute_dimensions: "{{ default_container_dimensions }}"
nova_compute_ironic_dimensions: "{{ default_container_dimensions }}" nova_compute_ironic_dimensions: "{{ default_container_dimensions }}"
####################
# HAProxy
####################
haproxy_nova_serialconsole_proxy_tunnel_timeout: "10m"
#################### ####################
# OpenStack # OpenStack
#################### ####################

6
releasenotes/notes/add-option-to-configure-nova-serial-console-timeout-7cfc764a0c19eb01.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Added an option, haproxy_nova_serialconsole_proxy_tunnel_timeout,
to configure the nova_serialconsole_proxy tunnel timeout. This default
is to keep the websocket connection alive for 10 minutes.