From de3647ec5fa9ad791967833d4727f3eae5695d12 Mon Sep 17 00:00:00 2001
From: Franciszek Przewoźny <przewozny.franciszek@gmail.com>
Date: Wed, 29 Jul 2026 07:48:35 +0000
Subject: Revert "Ensure OpenSearch waits for recovery during upgrade"

This reverts commit 79f6f2a049bad1d3cb51ba50981a01f63503a329.

Reason for revert: post-config job leaks OpenSearch secret to logs (see failed prometheus-opensearch jobs)

Change-Id: I63432e19c42ac9f3eebebadb474882ccda3780ed
Signed-off-by: fprzewozn <przewozny.franciszek@gmail.com>
---
 ansible/roles/opensearch/handlers/main.yml     | 23 -----------------------
 ansible/roles/opensearch/tasks/post-config.yml | 21 ---------------------
 2 files changed, 44 deletions(-)

(limited to 'ansible')

diff --git a/ansible/roles/opensearch/handlers/main.yml b/ansible/roles/opensearch/handlers/main.yml
index 361d9fcf2..0a279a9b0 100644
--- a/ansible/roles/opensearch/handlers/main.yml
+++ b/ansible/roles/opensearch/handlers/main.yml
@@ -57,29 +57,6 @@
     dimensions: "{{ service.dimensions }}"
     healthcheck: "{{ service.healthcheck | default(omit) }}"
 
-- name: Wait for OpenSearch cluster to recover
-  become: true
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: uri
-    module_args:
-      url: "{{ opensearch_internal_endpoint }}/_cluster/health?wait_for_status=yellow&timeout=30s"
-      timeout: 35
-      status_code: 200
-      validate_certs: "{{ kolla_enable_tls_internal | bool }}"
-      return_content: true
-      body_format: json
-      ca_path: "{{ openstack_cacert }}"
-  delegate_to: "{{ groups['opensearch'][0] }}"
-  run_once: true
-  retries: 60
-  delay: 5
-  register: result
-  until: result.get('status') == 200
-  listen: "Restart opensearch container"
-  when:
-    - kolla_action != "config"
-
 - name: Restart opensearch-dashboards container
   vars:
     service_name: "opensearch-dashboards"
diff --git a/ansible/roles/opensearch/tasks/post-config.yml b/ansible/roles/opensearch/tasks/post-config.yml
index deef86b9f..290e88365 100644
--- a/ansible/roles/opensearch/tasks/post-config.yml
+++ b/ansible/roles/opensearch/tasks/post-config.yml
@@ -88,27 +88,6 @@
     - not ansible_check_mode
     - opensearch_retention_policy_check.status == 404
 
-- name: Wait for OpenSearch Dashboards API to become ready
-  become: true
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: uri
-    module_args:
-      url: "{{ opensearch_dashboards_internal_endpoint }}/api/status"
-      method: GET
-      status_code: 200
-      url_username: "{{ opensearch_dashboards_user }}"
-      url_password: "{{ opensearch_dashboards_password }}"
-      force_basic_auth: true
-      ca_path: "{{ openstack_cacert }}"
-  register: result
-  until: result.get('status') == 200
-  retries: 30
-  delay: 10
-  delegate_to: "{{ groups['opensearch'][0] }}"
-  run_once: true
-  when: not ansible_check_mode
-
 - name: Create OpenSearch Dashboards Index Pattern
   become: true
   kolla_toolbox:
-- 
cgit v1.2.3