(ranger) 31/34: Backport to ranger-2.10: fix RANGER-5680 rename conflict leftovers

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ramackri pushed a commit to branch backport-audit-spiffe-2.10
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit 572542b8759199de536aac2413034479e098ca8b
Author: ramk <ra...@cloudera.com>
AuthorDate: Fri Sep 11 13:29:40 2026 +0530

    Backport to ranger-2.10: fix RANGER-5680 rename conflict leftovers
    
    5680 cherry-pick left conflict markers in docker-compose audit HDFS
    overlay and wait_for_keytab.sh from a rename/rename collision.
---
 ...ocker-compose.ranger-audit-destination-hdfs.yml | 26 ----------------------
 .../ranger-docker/scripts/wait_for_keytab.sh       | 11 ++-------
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/dev-support/ranger-docker/docker-compose.ranger-audit-destination-hdfs.yml b/dev-support/ranger-docker/docker-compose.ranger-audit-destination-hdfs.yml
index b1581a74f..ba4f0c006 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-audit-destination-hdfs.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-audit-destination-hdfs.yml
@@ -14,35 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<<< HEAD:dev-support/ranger-docker/scripts/wait_for_keytab.sh
-RETRY_COUNT="${KEYTAB_RETRY_COUNT:-5}"
-KEYTABS_DIR=/etc/keytabs
-
-KEYTAB=${KEYTABS_DIR}/$1
-
-for i in {1..RETRY_COUNT}; do
-  if [ -f ${KEYTAB} ]
-  then
-    break
-  else
-    echo [INFO] "Waiting for keytab ${KEYTAB}.."
-    sleep 5
-  fi
-done
-
-if [ -f ${KEYTAB} ]
-then
-  echo "[INFO] Found keytab ${KEYTAB}"
-  exit 0
-else
-  echo "[ERROR] Keytab not found: ${KEYTAB}"
-  exit 1
-fi
-========
 services:
   ranger-hadoop:
     profiles: ["audit-store-hdfs"]
     extends:
       file: docker-compose.ranger-hadoop.yml
       service: ranger-hadoop
->>>>>>>> d4a0759a4 (RANGER-5680: Restructure audit services in docker compose and use OpenSearch as the default Index Store (#1167)):dev-support/ranger-docker/docker-compose.ranger-audit-destination-hdfs.yml
diff --git a/dev-support/ranger-docker/scripts/wait_for_keytab.sh b/dev-support/ranger-docker/scripts/wait_for_keytab.sh
old mode 100644
new mode 100755
index b1581a74f..77d0f1783
--- a/dev-support/ranger-docker/scripts/wait_for_keytab.sh
+++ b/dev-support/ranger-docker/scripts/wait_for_keytab.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -14,7 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<<< HEAD:dev-support/ranger-docker/scripts/wait_for_keytab.sh
 RETRY_COUNT="${KEYTAB_RETRY_COUNT:-5}"
 KEYTABS_DIR=/etc/keytabs
 
@@ -38,11 +39,3 @@ else
   echo "[ERROR] Keytab not found: ${KEYTAB}"
   exit 1
 fi
-========
-services:
-  ranger-hadoop:
-    profiles: ["audit-store-hdfs"]
-    extends:
-      file: docker-compose.ranger-hadoop.yml
-      service: ranger-hadoop
->>>>>>>> d4a0759a4 (RANGER-5680: Restructure audit services in docker compose and use OpenSearch as the default Index Store (#1167)):dev-support/ranger-docker/docker-compose.ranger-audit-destination-hdfs.yml