From fe437272b4366e74aa7ec8502cc62f2925d51f23 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Thu, 6 Sep 2018 13:24:11 -0500 Subject: [PATCH] Ceph-RGW: Fix configmap-bin template This changes the conditional check for including the configmap-bin template in the ceph-rgw chart to their original state, and also adds the rgw-s3-admin.sh script that was removed unintentionally Change-Id: I60c3660a5bca37199effcf74f3060059345a327b --- ceph-rgw/templates/configmap-bin.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ceph-rgw/templates/configmap-bin.yaml b/ceph-rgw/templates/configmap-bin.yaml index c149593ea..98a118f10 100644 --- a/ceph-rgw/templates/configmap-bin.yaml +++ b/ceph-rgw/templates/configmap-bin.yaml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */}} -{{- if or (.Values.deployment.rgw_keystone_user_and_endpoints) (.Values.deployment.ceph) }} +{{- if and .Values.manifests.configmap_bin .Values.deployment.ceph }} {{- $envAll := . }} --- apiVersion: v1 @@ -38,5 +38,6 @@ data: {{ 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: | +{{ tuple "bin/rgw/_rgw-s3-admin.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }}