cf0ed142f6
This updates the helm-toolkit script for creating rgw s3 users to first check if a user exists, then create the user if it does not exist or modify the user's keys if it does exist. This is accomplished by using jq to identify all existing access keys for the specified user, removing those key pairs using the access key, then modifies the existing user with the supplied access/secret key pair for the given user This also updates the ceph-rgw chart to use the helm-toolkit s3 user script for creating the admin s3 user instead of using a similar script defined directly in the ceph-rgw chart Change-Id: I575b66415d44db7bb752102e45595305d86e623b
46 lines
1.6 KiB
YAML
46 lines
1.6 KiB
YAML
{{/*
|
|
Copyright 2017 The Openstack-Helm Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
{{- if and .Values.manifests.configmap_bin .Values.deployment.ceph }}
|
|
{{- $envAll := . }}
|
|
---
|
|
apiVersion: v1
|
|
kind: ConfigMap
|
|
metadata:
|
|
name: ceph-rgw-bin
|
|
data:
|
|
{{- if .Values.images.local_registry.active }}
|
|
image-repo-sync.sh: |
|
|
{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
|
|
{{- end }}
|
|
|
|
init-dirs.sh: |
|
|
{{ tuple "bin/_init-dirs.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
|
|
|
rgw-start.sh: |
|
|
{{ tuple "bin/rgw/_start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
|
rgw-init.sh: |
|
|
{{ tuple "bin/rgw/_init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
|
storage-init.sh: |
|
|
{{ tuple "bin/_ceph-rgw-storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
|
ceph-admin-keyring.sh: |
|
|
{{ tuple "bin/_ceph-admin-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
|
rgw-s3-admin.sh: |
|
|
{{- include "helm-toolkit.scripts.create_s3_user" . | indent 4 }}
|
|
helm-tests.sh: |
|
|
{{ tuple "bin/_helm-tests.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
|
{{- end }}
|