openstack
/
openstack-helm-infra
Code Issues Proposed changes

Merge "[CEPH] Use civetweb by default for RGW with keystone"

This commit is contained in:
Zuul 2019-02-21 14:16:22 +00:00 committed by Gerrit Code Review
parent 7387ecd71c aad0394963
commit b8b72d7e16
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceph-rgw/templates/bin/rgw/_init.sh.tpl
View File

@ -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