From aad0394963e6916afc715c8289604349442675f7 Mon Sep 17 00:00:00 2001
From: Matthew Heler <matthew.heler@hotmail.com>
Date: Tue, 19 Feb 2019 10:42:28 -0600
Subject: [PATCH] [CEPH] Use civetweb by default for RGW with keystone

Currently there is a bug in the beast code that makes it fail
during the initial lookup for a keystone user map. For the time
being we will continue to use civetweb when keystone is present
until this issue is resolved.

Change-Id: I56bcd77f38adb3763d35f46443c1403816d1dcea
---
 ceph-rgw/templates/bin/rgw/_init.sh.tpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ceph-rgw/templates/bin/rgw/_init.sh.tpl b/ceph-rgw/templates/bin/rgw/_init.sh.tpl
index bdb2e2fc0..6b1b3c005 100644
--- a/ceph-rgw/templates/bin/rgw/_init.sh.tpl
+++ b/ceph-rgw/templates/bin/rgw/_init.sh.tpl
@@ -23,7 +23,6 @@ cp -va /etc/ceph/ceph.conf.template /etc/ceph/ceph.conf
 cat >> /etc/ceph/ceph.conf <<EOF
 
 [client.rgw.$(hostname -s)]
-rgw_frontends = "beast port=${RGW_FRONTEND_PORT}"
 {{ range $key, $value := .Values.conf.rgw.config -}}
 {{- if kindIs "slice" $value -}}
 {{ $key }} = {{ include "helm-toolkit.joinListWithComma" $value | quote }}
@@ -32,6 +31,7 @@ rgw_frontends = "beast port=${RGW_FRONTEND_PORT}"
 {{ end -}}
 {{- end -}}
 {{ if .Values.conf.rgw_ks.enabled }}
+rgw_frontends = "civetweb port=${RGW_FRONTEND_PORT}"
 rgw_keystone_url = "${KEYSTONE_URL}"
 rgw_keystone_admin_user = "${OS_USERNAME}"
 rgw_keystone_admin_password = "${OS_PASSWORD}"
@@ -45,6 +45,8 @@ rgw_keystone_admin_domain = "${OS_USER_DOMAIN_NAME}"
 {{ end -}}
 {{- end -}}
 {{ end }}
+{{ if .Values.conf.rgw_s3.enabled }}
+rgw_frontends = "beast port=${RGW_FRONTEND_PORT}"
 {{ range $key, $value := .Values.conf.rgw_s3.config -}}
 {{- if kindIs "slice" $value -}}
 {{ $key }} = {{ include "helm-toolkit.joinListWithComma" $value | quote }}
@@ -52,5 +54,5 @@ rgw_keystone_admin_domain = "${OS_USER_DOMAIN_NAME}"
 {{ $key }} = {{ $value | quote  }}
 {{ end -}}
 {{- end -}}
-
+{{ end }}
 EOF