From b8ac702c07deff953a05461dbf120e2c8347ae65 Mon Sep 17 00:00:00 2001 From: Krishna Venkata Date: Mon, 29 Apr 2019 22:56:11 +0000 Subject: [PATCH] Revert "Fix: update merge to mergeOverwrite" Reverting this commit to fix Multiple OSD issue. Ceph deployment is failing when we specifying multiple osds. Rendered file for ceph-osd charts have duplicate osd information. Reverts this PS: https://review.opendev.org/#/c/644604/ This reverts commit 0b8784f26d4ff9d7054a30d8024cae24db93ed0d. Change-Id: Ida018955eb558c9f890cc9e6aefba6689c992a73 --- 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 ce0cfb5f8..0553e0038 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 }} -{{ mergeOverwrite $context.Values.__daemonset_yaml $context.Values.__tmpYAML | toYaml }} +{{ merge $context.Values.__tmpYAML $context.Values.__daemonset_yaml | toYaml }} {{ end }}