From d038fb98b57a8df2f2b36d26ad9588e05de3f9be Mon Sep 17 00:00:00 2001
From: Veera Pirla <17177346+mrveera@users.noreply.github.com>
Date: Thu, 21 Sep 2023 19:03:18 +0530
Subject: [PATCH] [bitnami/airflow] Fix airflow connectivity issue when redis
 is in ssl mode (#49326)

Fix airflow connectivity issue when redis is in ssl mode

Signed-off-by: Veera Pirla <17177346+mrveera@users.noreply.github.com>
---
 .../2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh         | 1 +
 .../2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh         | 1 +
 .../airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh | 1 +
 3 files changed, 3 insertions(+)

diff --git a/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
index 70b777fc7fc2..e57ac90b5b61 100644
--- a/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
+++ b/bitnami/airflow-scheduler/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
@@ -402,6 +402,7 @@ airflow_configure_celery_executor() {
     local -r redis_user=$(airflow_encode_url "$REDIS_USER")
     local -r redis_password=$(airflow_encode_url "$REDIS_PASSWORD")
     airflow_conf_set "celery" "broker_url" "redis://${redis_user}:${redis_password}@${REDIS_HOST}:${REDIS_PORT_NUMBER}/${REDIS_DATABASE}"
+    is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && airflow_conf_set "celery" "broker_url" "rediss://${redis_user}:${redis_password}@${REDIS_HOST}:${REDIS_PORT_NUMBER}/${REDIS_DATABASE}"
     is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && airflow_conf_set "celery" "redis_backend_use_ssl" "true"
 
     # Configure celery backend
diff --git a/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
index 70b777fc7fc2..e57ac90b5b61 100644
--- a/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
+++ b/bitnami/airflow-worker/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
@@ -402,6 +402,7 @@ airflow_configure_celery_executor() {
     local -r redis_user=$(airflow_encode_url "$REDIS_USER")
     local -r redis_password=$(airflow_encode_url "$REDIS_PASSWORD")
     airflow_conf_set "celery" "broker_url" "redis://${redis_user}:${redis_password}@${REDIS_HOST}:${REDIS_PORT_NUMBER}/${REDIS_DATABASE}"
+    is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && airflow_conf_set "celery" "broker_url" "rediss://${redis_user}:${redis_password}@${REDIS_HOST}:${REDIS_PORT_NUMBER}/${REDIS_DATABASE}"
     is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && airflow_conf_set "celery" "redis_backend_use_ssl" "true"
 
     # Configure celery backend
diff --git a/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
index 70b777fc7fc2..e57ac90b5b61 100644
--- a/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
+++ b/bitnami/airflow/2/debian-11/rootfs/opt/bitnami/scripts/libairflow.sh
@@ -402,6 +402,7 @@ airflow_configure_celery_executor() {
     local -r redis_user=$(airflow_encode_url "$REDIS_USER")
     local -r redis_password=$(airflow_encode_url "$REDIS_PASSWORD")
     airflow_conf_set "celery" "broker_url" "redis://${redis_user}:${redis_password}@${REDIS_HOST}:${REDIS_PORT_NUMBER}/${REDIS_DATABASE}"
+    is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && airflow_conf_set "celery" "broker_url" "rediss://${redis_user}:${redis_password}@${REDIS_HOST}:${REDIS_PORT_NUMBER}/${REDIS_DATABASE}"
     is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && airflow_conf_set "celery" "redis_backend_use_ssl" "true"
 
     # Configure celery backend