From 2dd5bdf82e573dc4baf8d7c48a442021e99a9d64 Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Tue, 7 Feb 2023 14:34:07 -0700
Subject: [PATCH] [ceph-rgw] Replace civetweb with beast for unencrypted
 connections

Replaces civetweb with beast for unencrypted RGW connections when
Keystone is enabled for authentication.

Change-Id: I531b169eb241464284d8fdf72f52436692092d6b
---
 ceph-rgw/Chart.yaml                     | 2 +-
 ceph-rgw/templates/bin/rgw/_init.sh.tpl | 2 +-
 releasenotes/notes/ceph-rgw.yaml        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ceph-rgw/Chart.yaml b/ceph-rgw/Chart.yaml
index 9d795b668..7d69d51b2 100644
--- a/ceph-rgw/Chart.yaml
+++ b/ceph-rgw/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph RadosGW
 name: ceph-rgw
-version: 0.1.23
+version: 0.1.24
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-rgw/templates/bin/rgw/_init.sh.tpl b/ceph-rgw/templates/bin/rgw/_init.sh.tpl
index 3e6932f72..1e52bdcde 100644
--- a/ceph-rgw/templates/bin/rgw/_init.sh.tpl
+++ b/ceph-rgw/templates/bin/rgw/_init.sh.tpl
@@ -54,7 +54,7 @@ cat >> ${CEPH_CONF} <<EOF
 {{- if .Values.manifests.certificates }}
 rgw_frontends = "beast ssl_port=${RGW_FRONTEND_PORT} ssl_certificate=/etc/tls/tls.crt ssl_private_key=/etc/tls/tls.key"
 {{- else }}
-rgw_frontends = "civetweb port=${RGW_FRONTEND_PORT}"
+rgw_frontends = "beast port=${RGW_FRONTEND_PORT}"
 {{- end }}
 rgw_keystone_url = "${KEYSTONE_URL}"
 rgw_keystone_admin_user = "${OS_USERNAME}"
diff --git a/releasenotes/notes/ceph-rgw.yaml b/releasenotes/notes/ceph-rgw.yaml
index 8d953344b..938c893c6 100644
--- a/releasenotes/notes/ceph-rgw.yaml
+++ b/releasenotes/notes/ceph-rgw.yaml
@@ -24,4 +24,5 @@ ceph-rgw:
   - 0.1.21 Correct mon discovery for multiple RGWs in different NS
   - 0.1.22 Update default image values
   - 0.1.23 Added OCI registry authentication
+  - 0.1.24 Replace civetweb with beast for unencrypted connections
 ...