From b39e27891b642ab7f70e130cd42e2f7757a8b18e Mon Sep 17 00:00:00 2001
From: Chinasubbareddy M <cr3938@att.com>
Date: Tue, 4 Sep 2018 12:51:22 -0500
Subject: [PATCH] Ceph-rgw: make configmap names to be driven via chart values

This to avoid configmap names conflicts with ther ceph charts

Change-Id: I73906fe69dd729fef0299149350caf021aab07e5
---
 ceph-rgw/templates/configmap-bin.yaml                | 4 +---
 ceph-rgw/templates/configmap-ceph-rgw-templates.yaml | 2 +-
 ceph-rgw/templates/job-rgw-storage-init.yaml         | 4 ++--
 ceph-rgw/values.yaml                                 | 3 +++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ceph-rgw/templates/configmap-bin.yaml b/ceph-rgw/templates/configmap-bin.yaml
index a9c96f9bc..c149593ea 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 and .Values.manifests.configmap_bin .Values.deployment.ceph }}
+{{- if or (.Values.deployment.rgw_keystone_user_and_endpoints) (.Values.deployment.ceph) }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
@@ -38,7 +38,5 @@ 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 }}
diff --git a/ceph-rgw/templates/configmap-ceph-rgw-templates.yaml b/ceph-rgw/templates/configmap-ceph-rgw-templates.yaml
index e446e4461..770700525 100644
--- a/ceph-rgw/templates/configmap-ceph-rgw-templates.yaml
+++ b/ceph-rgw/templates/configmap-ceph-rgw-templates.yaml
@@ -20,7 +20,7 @@ limitations under the License.
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ceph-templates
+  name: {{ printf "%s-%s" $envAll.Release.Name "ceph-templates" | quote }}
 data:
   bootstrap.keyring.rgw: |
 {{ .Values.conf.templates.keyring.bootstrap.rgw | indent 4 }}
diff --git a/ceph-rgw/templates/job-rgw-storage-init.yaml b/ceph-rgw/templates/job-rgw-storage-init.yaml
index 92ffce04b..8f9a58d1d 100644
--- a/ceph-rgw/templates/job-rgw-storage-init.yaml
+++ b/ceph-rgw/templates/job-rgw-storage-init.yaml
@@ -121,11 +121,11 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         - name: ceph-templates
           configMap:
-            name: ceph-templates
+            name: {{ printf "%s-%s" $envAll.Release.Name "ceph-templates" | quote }}
             defaultMode: 0444
         - name: ceph-keyring
           secret:
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index 03c54462c..de6be5581 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -111,6 +111,9 @@ pod:
           memory: "1024Mi"
           cpu: "2000m"
 
+ceph_client:
+  configmap: ceph-etc
+
 secrets:
   keyrings:
     mon: ceph-mon-keyring