openstack
/
openstack-helm
Code Issues Proposed changes

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
This commit is contained in:
portdirect 2018-03-30 01:40:50 -04:00 committed by Pete Birley
parent fa681ab736
commit e6758afeec
8 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ceph/templates/configmap-templates.yaml
View File

@ -23,15 +23,15 @@ metadata:
name: ceph-templates
data:
admin.keyring: |
{{ tuple "templates/_admin.keyring.tpl" . | include "helm-toolkit.utils.template" | 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 }}
{{ .Values.conf.templates.keyring.admin | 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 }}

7
ceph/templates/templates/_admin.keyring.tpl
View File

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

3
ceph/templates/templates/_bootstrap.keyring.mds.tpl
View File

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

3
ceph/templates/templates/_bootstrap.keyring.mgr.tpl
View File

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

3
ceph/templates/templates/_bootstrap.keyring.osd.tpl
View File

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

3
ceph/templates/templates/_bootstrap.keyring.rgw.tpl
View File

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

3
ceph/templates/templates/_mon.keyring.tpl
View File

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

31
ceph/values.yaml
View File

@ -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