Ceph-storage-init : make configmap and secret names to be driven via chart values

This is make ceph configmap and admin keyring secret names using
in storage init scripts to be read  from chart values as we may
have two ceph clusters  gets activated in one namespace and
each ceph clsuter will have its own configmap and admin secret names.

Change-Id: I84d94f3ac21e602c50619e456ff327ae1da53622

cinder/templates/deployment-backup.yaml

@@ -207,7 +207,7 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         {{ end }}
         {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }}

cinder/templates/deployment-volume.yaml

@@ -167,7 +167,7 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         - name: ceph-keyring
           secret:

cinder/templates/job-backup-storage-init.yaml

@@ -155,7 +155,7 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         {{- if .Values.backup.external_ceph_rbd.enabled }}
         - name: cinder-etc
@@ -166,7 +166,7 @@ spec:
         {{- if empty .Values.conf.ceph.admin_keyring }}
         - name: ceph-keyring
           secret:
-            secretName: pvc-ceph-client-key
+            secretName: {{ .Values.ceph_client.user_secret_name }}
         {{ end }}
         {{ end }}
 {{- end }}

cinder/templates/job-storage-init.yaml

@@ -141,12 +141,12 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         {{- if empty .Values.conf.ceph.admin_keyring }}
         - name: ceph-keyring
           secret:
-            secretName: pvc-ceph-client-key
+            secretName: {{ .Values.ceph_client.user_secret_name }}
         {{- end }}
         {{- end }}
 {{- end }}

cinder/values.yaml

@@ -270,6 +270,10 @@ network:
       enabled: false
       port: 30877
 
+ceph_client:
+  configmap: ceph-etc
+  user_secret_name: pvc-ceph-client-key
+
 conf:
   paste:
     composite:osapi_volume:

glance/templates/deployment-api.yaml

@@ -173,7 +173,7 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         - name: ceph-keyring
           secret:

glance/templates/job-storage-init.yaml

@@ -156,12 +156,12 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         {{- if empty .Values.conf.ceph.admin_keyring }}
         - name: ceph-keyring
           secret:
-            secretName: pvc-ceph-client-key
+            secretName: {{ .Values.ceph_client.user_secret_name }}
         {{ end }}
         {{ end }}
         {{- if eq .Values.storage "pvc" }}

glance/values.yaml

@@ -79,6 +79,10 @@ bootstrap:
           hypervisor_type: "qemu"
           os_distro: "cirros"
 
+ceph_client:
+  configmap: ceph-etc
+  user_secret_name: pvc-ceph-client-key
+
 conf:
   rally_tests:
     run_tempest: false

gnocchi/templates/daemonset-metricd.yaml

@@ -109,7 +109,7 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
         - name: ceph-keyring
           secret:
             secretName: {{ .Values.secrets.rbd | quote }}

gnocchi/templates/daemonset-statsd.yaml

@@ -115,7 +115,7 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
         - name: ceph-keyring
           secret:
             secretName: {{ .Values.secrets.rbd | quote }}

gnocchi/templates/deployment-api.yaml

@@ -134,7 +134,7 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
         - name: ceph-keyring
           secret:
             secretName: {{ .Values.secrets.rbd | quote }}

gnocchi/templates/job-db-sync.yaml

@@ -87,7 +87,7 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
         - name: ceph-keyring
           secret:
             secretName: {{ .Values.secrets.rbd | quote }}

gnocchi/templates/job-storage-init.yaml

@@ -124,9 +124,9 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         - name: ceph-keyring
           secret:
-            secretName: pvc-ceph-client-key
+            secretName: {{ .Values.ceph_client.user_secret_name }}
 {{- end }}

gnocchi/values.yaml

@@ -422,6 +422,10 @@ conf:
       auth_version: v3
       memcache_security_strategy: ENCRYPT
 
+ceph_client:
+  configmap: ceph-etc
+  user_secret_name: pvc-ceph-client-key
+
 secrets:
   identity:
     admin: gnocchi-keystone-admin

libvirt/templates/daemonset-libvirt.yaml

@@ -195,12 +195,12 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         {{- if empty .Values.conf.ceph.cinder.keyring }}
         - name: ceph-keyring
           secret:
-            secretName: pvc-ceph-client-key
+            secretName: {{ .Values.ceph_client.user_secret_name }}
         {{ end }}
         {{ end }}
         - name: libmodules

libvirt/values.yaml

@@ -58,6 +58,10 @@ endpoints:
       registry:
         node: 5000
 
+ceph_client:
+  configmap: ceph-etc
+  user_secret_name: pvc-ceph-client-key
+
 conf:
   ceph:
     enabled: true

nova/templates/daemonset-compute.yaml

@@ -298,12 +298,12 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         {{- if empty .Values.conf.ceph.cinder.keyring }}
         - name: ceph-keyring
           secret:
-            secretName: pvc-ceph-client-key
+            secretName: {{ .Values.ceph_client.user_secret_name }}
         {{ end }}
         {{ end }}
         - name: libmodules

nova/values.yaml

@@ -443,6 +443,10 @@ ssh:
     - ecdsa
     - ed25519
 
+ceph_client:
+  configmap: ceph-etc
+  user_secret_name: pvc-ceph-client-key
+
 conf:
   ceph:
     enabled: true