openstack
/
openstack-helm-infra
Code Issues Proposed changes

Merge "Fix: update merge to mergeOverwrite"

This commit is contained in:
Zuul 2019-03-21 03:27:07 +00:00 committed by Gerrit Code Review
parent 87caa23970 0b8784f26d
commit 8f3a397e9a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
View File

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