Ceph: Move all config to be directly values driven.

This PS moves all the keyring templates to be directly values driven,
both simplifying over-ride and allowing configs to be targeted
to pods in future work.

Change-Id: I7752cbfdeef85f71a1a084437556de062cbb5680

ceph/templates/configmap-templates.yaml

@@ -23,15 +23,15 @@ metadata:
   name: ceph-templates
 data:
   admin.keyring: |
-{{ tuple "templates/_admin.keyring.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+{{ .Values.conf.templates.keyring.admin | indent 4 }}
-  bootstrap.keyring.mds: |
-{{ tuple "templates/_bootstrap.keyring.mds.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  bootstrap.keyring.mgr: |
-{{ tuple "templates/_bootstrap.keyring.mgr.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  bootstrap.keyring.osd: |
-{{ tuple "templates/_bootstrap.keyring.osd.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  bootstrap.keyring.rgw: |
-{{ tuple "templates/_bootstrap.keyring.rgw.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   mon.keyring: |
-{{ tuple "templates/_mon.keyring.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+{{ .Values.conf.templates.keyring.mon | indent 4 }}
+  bootstrap.keyring.mds: |
+{{ .Values.conf.templates.keyring.bootstrap.mds | indent 4 }}
+  bootstrap.keyring.mgr: |
+{{ .Values.conf.templates.keyring.bootstrap.mgr | indent 4 }}
+  bootstrap.keyring.osd: |
+{{ .Values.conf.templates.keyring.bootstrap.osd | indent 4 }}
+  bootstrap.keyring.rgw: |
+{{ .Values.conf.templates.keyring.bootstrap.rgw | indent 4 }}
 {{- end }}

ceph/templates/templates/_admin.keyring.tpl

@@ -1,7 +0,0 @@
-[client.admin]
-  key = {{"{{"}} key {{"}}"}}
-  auid = 0
-  caps mds = "allow"
-  caps mon = "allow *"
-  caps osd = "allow *"
-  caps mgr = "allow *"

ceph/templates/templates/_bootstrap.keyring.mds.tpl

@@ -1,3 +0,0 @@
-[client.bootstrap-mds]
-  key = {{"{{"}} key {{"}}"}}
-  caps mon = "allow profile bootstrap-mds"

ceph/templates/templates/_bootstrap.keyring.mgr.tpl

@@ -1,3 +0,0 @@
-[client.bootstrap-mgr]
-  key = {{"{{"}} key {{"}}"}}
-  caps mgr = "allow profile bootstrap-mgr"

ceph/templates/templates/_bootstrap.keyring.osd.tpl

@@ -1,3 +0,0 @@
-[client.bootstrap-osd]
-  key = {{"{{"}} key {{"}}"}}
-  caps mon = "allow profile bootstrap-osd"

ceph/templates/templates/_bootstrap.keyring.rgw.tpl

@@ -1,3 +0,0 @@
-[client.bootstrap-rgw]
-  key = {{"{{"}} key {{"}}"}}
-  caps mon = "allow profile bootstrap-rgw"

ceph/templates/templates/_mon.keyring.tpl

@@ -1,3 +0,0 @@
-[mon.]
-  key = {{"{{"}} key {{"}}"}}
-  caps mon = "allow *"

ceph/values.yaml

@@ -193,6 +193,37 @@ network:
     mgr: 7000
 
 conf:
+  templates:
+    keyring:
+      admin: |
+        [client.admin]
+          key = {{ key }}
+          auid = 0
+          caps mds = "allow"
+          caps mon = "allow *"
+          caps osd = "allow *"
+          caps mgr = "allow *"
+      mon: |
+        [mon.]
+          key = {{ key }}
+          caps mon = "allow *"
+      bootstrap:
+        mds: |
+          [client.bootstrap-mds]
+            key = {{ key }}
+            caps mon = "allow profile bootstrap-mds"
+        mgr: |
+          [client.bootstrap-mgr]
+            key = {{ key }}
+            caps mgr = "allow profile bootstrap-mgr"
+        osd: |
+          [client.bootstrap-osd]
+            key = {{ key }}
+            caps mon = "allow profile bootstrap-osd"
+        rgw: |
+          [client.bootstrap-rgw]
+            key = {{ key }}
+            caps mon = "allow profile bootstrap-rgw"
   features:
     mds: true
     rgw: true