Merge pull request openstack-k8s-operators#1047 from openshift-cherry…

…pick-robot/cherry-pick-1023-to-v1.3.x [v1.3.x] InstanceHA: Use deep-merge for FencingConfig
openshift-cherrypick-robot · May 8, 2024 · 7b6d7c3 · 7b6d7c3
2 parents 409c3db + 2e08a41
commit 7b6d7c3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/templates/openstackconfiggenerator/config/common/fencing.yaml b/templates/openstackconfiggenerator/config/common/fencing.yaml
@@ -15,4 +15,6 @@ parameter_defaults:
           power_timeout: 30
           kubeconfig: /root/kubeconfig/kubeconfig
 {{- end }}
-{{- end }}
+parameter_merge_strategies:
+  FencingConfig: deep_merge
+{{- end }}