From 486de99dc8433ed250f8b18b699c795eaacbf40d Mon Sep 17 00:00:00 2001
From: Giacomo Lanciano <giacomo.lanciano@sns.it>
Date: Mon, 8 Feb 2021 20:00:34 +0100
Subject: [PATCH] Fix monasca-grafana check

- Increment retries: waiting 20 seconds (i.e., 10 retries) seem to
  be not enough for monasca-grafana to start on the first node.
  Increasing to 80 seconds (i.e., 40 retries) fixes the issue.

- Prevent the check from running when kolla_action=config. In that
  case, the command would never succeed as the service is not
  deployed yet (similarly to
  https://review.opendev.org/c/openstack/kolla-ansible/+/771237).

Closes-Bug: #1915060
Related-Bug: #1821285
Change-Id: I7b42c51a66caed0eccf118615d841dca97a7af9d
---
 ansible/roles/monasca/handlers/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/monasca/handlers/main.yml b/ansible/roles/monasca/handlers/main.yml
index dd3f1016c1..7eb6162825 100644
--- a/ansible/roles/monasca/handlers/main.yml
+++ b/ansible/roles/monasca/handlers/main.yml
@@ -180,9 +180,10 @@
       status_code: 200
   register: result
   until: result.get('status') == 200
-  retries: 10
+  retries: 40
   delay: 2
   when:
+    - kolla_action != "config"
     - inventory_hostname == groups[service.group]|first
 
 - name: Restart remaining monasca-grafana containers