Merge "Bump timeout for grafana startup"

This commit is contained in:
Zuul 2021-12-16 15:13:17 +00:00 committed by Gerrit Code Review
commit a681494528
3 changed files with 15 additions and 2 deletions

View File

@ -81,6 +81,9 @@ grafana_default_volumes:
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
grafana_extra_volumes: "{{ default_extra_volumes }}" grafana_extra_volumes: "{{ default_extra_volumes }}"
grafana_start_first_node_delay: 10
grafana_start_first_node_retries: 12
############ ############
# Prometheus # Prometheus
############ ############

View File

@ -29,8 +29,8 @@
status_code: 200 status_code: 200
register: result register: result
until: result.get('status') == 200 until: result.get('status') == 200
retries: 10 retries: "{{ grafana_start_first_node_retries }}"
delay: 2 delay: "{{ grafana_start_first_node_delay }}"
when: when:
- kolla_action != "config" - kolla_action != "config"
- inventory_hostname == groups[service.group]|first - inventory_hostname == groups[service.group]|first

View File

@ -0,0 +1,10 @@
---
fixes:
- |
On slower nodes, the initial grafana startup could experience a
timeout failure when the migrations for setting up the database
took longer than expected. This has been fixed by increasing the
default timeout. The timeout settings can be changed via new
parameters ``grafana_start_first_node_delay`` and
``grafana_start_first_node_retries`` for the ``grafana`` role.
`LP#1769962 <https://launchpad.net/bugs/1769962>`__