From 2e08a41c53f8ab58759c9ded7af8ab45e8553f6a Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Tue, 2 Apr 2024 12:29:12 +0100 Subject: [PATCH] InstanceHA: Use deep-merge for FencingConfig Required to allow additional FencingConfig to be added for compute nodes Resolves: OSP-31777 --- templates/openstackconfiggenerator/config/common/fencing.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/openstackconfiggenerator/config/common/fencing.yaml b/templates/openstackconfiggenerator/config/common/fencing.yaml index aeff7a3d..d6fc7191 100644 --- 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 }} \ No newline at end of file +parameter_merge_strategies: + FencingConfig: deep_merge +{{- end }}