openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add variable for changing Apache HTTP timeout"

Browse Source
This commit is contained in:
Zuul 2021-03-07 10:41:37 +00:00 committed by Gerrit Code Review
commit 4e7d1ab9cb
19 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -794,6 +794,7 @@ haproxy_backend_cacert_dir: "/etc/ssl/certs"
# Backend options # Backend options
################## ##################
kolla_httpd_keep_alive: "60" kolla_httpd_keep_alive: "60"
kolla_httpd_timeout: "60"
###################### ######################
# Backend TLS options # Backend TLS options

1
ansible/roles/aodh/templates/wsgi-aodh.conf.j2
View File

@ -5,6 +5,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ aodh_api_l
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
ErrorLog "{{ aodh_log_dir }}/apache-error.log" ErrorLog "{{ aodh_log_dir }}/apache-error.log"

1
ansible/roles/cinder/templates/cinder-wsgi.conf.j2
View File

@ -10,6 +10,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ cinder_api
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
{% if cinder_logging_debug | bool %} {% if cinder_logging_debug | bool %}

1
ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2
View File

@ -5,6 +5,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ cloudkitty
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
ErrorLog "{{ cloudkitty_log_dir }}/apache-error.log" ErrorLog "{{ cloudkitty_log_dir }}/apache-error.log"

1
ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2
View File

@ -5,6 +5,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ freezer_ap
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
ErrorLog "{{ freezer_log_dir }}/apache-error.log" ErrorLog "{{ freezer_log_dir }}/apache-error.log"

1
ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2
View File

@ -5,6 +5,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ gnocchi_ap
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
ErrorLog "{{ gnocchi_log_dir }}/apache-error.log" ErrorLog "{{ gnocchi_log_dir }}/apache-error.log"

1
ansible/roles/heat/templates/wsgi-heat-api-cfn.conf.j2
View File

@ -12,6 +12,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ heat_api_c
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
<Directory "{{ binary_path }}"> <Directory "{{ binary_path }}">

1
ansible/roles/heat/templates/wsgi-heat-api.conf.j2
View File

@ -12,6 +12,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ heat_api_l
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
<Directory "{{ binary_path }}"> <Directory "{{ binary_path }}">

1
ansible/roles/ironic/templates/ironic-api-wsgi.conf.j2
View File

@ -12,6 +12,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ ironic_api
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
<Directory "{{ wsgi_directory }}"> <Directory "{{ wsgi_directory }}">

1
ansible/roles/keystone/templates/wsgi-keystone.conf.j2
View File

@ -13,6 +13,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ keystone_a
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
ErrorLog "{{ keystone_log_dir }}/apache-error.log" ErrorLog "{{ keystone_log_dir }}/apache-error.log"

1
ansible/roles/masakari/templates/wsgi-masakari.conf.j2
View File

@ -6,6 +6,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ masakari_a
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
ErrorLog "{{ masakari_log_dir }}/apache-error.log" ErrorLog "{{ masakari_log_dir }}/apache-error.log"

1
ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2
View File

@ -4,6 +4,7 @@
Listen {{ api_interface_address | put_address_in_context('url') }}:{{ monasca_api_port }} Listen {{ api_interface_address | put_address_in_context('url') }}:{{ monasca_api_port }}
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
ErrorLog "{{ monasca_log_dir }}/apache-api-error.log" ErrorLog "{{ monasca_log_dir }}/apache-api-error.log"

1
ansible/roles/nova/templates/nova-api-wsgi.conf.j2
View File

@ -13,6 +13,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ nova_metad
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
<Directory "{{ wsgi_directory }}"> <Directory "{{ wsgi_directory }}">

1
ansible/roles/panko/templates/wsgi-panko.conf.j2
View File

@ -5,6 +5,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ panko_api_
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
ErrorLog "{{ panko_log_dir }}/apache-error.log" ErrorLog "{{ panko_log_dir }}/apache-error.log"

1
ansible/roles/placement/templates/placement-api-wsgi.conf.j2
View File

@ -12,6 +12,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ placement_
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
{% if placement_logging_debug | bool %} {% if placement_logging_debug | bool %}

1
ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2
View File

@ -4,6 +4,7 @@ Listen {{ 'api' | kolla_address | put_address_in_context('url') }}:{{ vitrage_ap
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
ErrorLog "{{ vitrage_log_dir }}/apache-error.log" ErrorLog "{{ vitrage_log_dir }}/apache-error.log"

1
ansible/roles/zun/templates/wsgi-zun.conf.j2
View File

@ -4,6 +4,7 @@ Listen {{ api_interface_address | put_address_in_context('url') }}:{{ zun_api_po
ServerSignature Off ServerSignature Off
ServerTokens Prod ServerTokens Prod
TraceEnable off TraceEnable off
TimeOut {{ kolla_httpd_timeout }}
KeepAliveTimeout {{ kolla_httpd_keep_alive }} KeepAliveTimeout {{ kolla_httpd_keep_alive }}
ErrorLog "{{ zun_log_dir }}/apache-error.log" ErrorLog "{{ zun_log_dir }}/apache-error.log"

1
etc/kolla/globals.yml
View File

@ -214,6 +214,7 @@
# Backend options # Backend options
################## ##################
#kolla_httpd_keep_alive: "60" #kolla_httpd_keep_alive: "60"
#kolla_httpd_timeout: "60"
##################### #####################
# Backend TLS options # Backend TLS options

13
releasenotes/notes/add-httpd-timeout-717050ffdc4ea9e8.yaml Normal file
View File

@ -0,0 +1,13 @@
---
features:
- |
Adds configuration parameter ``kolla_httpd_timeout`` to configure the
``TimeOut`` directive for services that use Apache HTTP server to
handle HTTP requests. The default value is 60 seconds which matches
the original default, but you may wish to increase this.
fixes:
- |
Fixes an issue where it was not easily possible to set the Apache
HTTP timeout directive, where the default of 60s would cause
problems in slow running services. See
`LP#1917648 <https://launchpad.net/bugs/1917648>`__.