Merge "[ceph-osd] get configmap and daemonset names from values"

This commit is contained in:
Zuul 2019-09-03 22:30:02 +00:00 committed by Gerrit Code Review
commit b10d7b915b
2 changed files with 4 additions and 1 deletions

View File

@ -379,7 +379,7 @@ spec:
{{- end }}
{{- if .Values.manifests.daemonset_osd }}
{{- $daemonset := "osd" }}
{{- $daemonset := .Values.daemonset.prefix_name }}
{{- $configMapName := (printf "%s-%s" .Release.Name "etc") }}
{{- $serviceAccountName := (printf "%s" .Release.Name) }}
{{ tuple . "osd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}

View File

@ -241,6 +241,9 @@ conf:
# type: directory
# location: /var/lib/openstack-helm/ceph/osd/journal-three
daemonset:
prefix_name: "osd"
dependencies:
dynamic:
common: