From 0b8784f26d4ff9d7054a30d8024cae24db93ed0d Mon Sep 17 00:00:00 2001
From: Roman Gorshunov <roman.gorshunov@att.com>
Date: Tue, 19 Mar 2019 16:52:23 +0100
Subject: [PATCH] Fix: update merge to mergeOverwrite

Change-Id: Icd43013bcb97f7b2f9a049f0a20a550d8b577da3
---
 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 0553e0038..ce0cfb5f8 100644
--- a/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
+++ b/ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
@@ -349,7 +349,7 @@ limitations under the License.
 
   {{- $_ := set $context.Values.__tmpYAML.spec.template.spec "volumes" $context.Values.__tmpPodVols }}
 
-{{ merge $context.Values.__tmpYAML $context.Values.__daemonset_yaml | toYaml }}
+{{ mergeOverwrite $context.Values.__daemonset_yaml $context.Values.__tmpYAML | toYaml }}
 
 {{ end }}