From 0ffa12abdbc08d654271b2aaf2a8c5b4e3d2afc9 Mon Sep 17 00:00:00 2001 From: Renis Date: Fri, 22 Jun 2018 13:53:09 -0700 Subject: [PATCH] Ceph: update daemonset overrides to reference correct key This PS updates the ceph daemonset over-rides function to reference the correct key, rather than the chart name to apply host/label specific configuration. Change-Id: Id4004077a7cc0e7e4caceff6779165e8a7c3e6ef Signed-off-by: Pete Birley --- ceph-osd/templates/utils/_osd_daemonset_overrides.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl b/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl index 05d6049a60..550b6c25ce 100644 --- a/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl +++ b/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl @@ -22,7 +22,7 @@ limitations under the License. {{- $context := index . 4 }} {{- $_ := unset $context ".Files" }} {{- $_ := set $context.Values "__daemonset_yaml" $daemonset_yaml }} - {{- $daemonset_root_name := printf (print $context.Chart.Name "_" $daemonset) }} + {{- $daemonset_root_name := printf "ceph_%s" $daemonset }} {{- $_ := set $context.Values "__daemonset_list" list }} {{- $_ := set $context.Values "__default" dict }} {{- if hasKey $context.Values.conf "overrides" }}