From f3968c6415a9e1c2f985ed187623bba2901d1cda Mon Sep 17 00:00:00 2001
From: ramishra <ramishra@redhat.com>
Date: Fri, 9 Apr 2021 16:25:08 +0530
Subject: [PATCH] Remove UndercloudExtraConfig merge_strategy

This would not have worked before we enabled server side
env merging and also we don't set that parameter in that
environment.

Change-Id: Icd6d9a12b59cf8234edb671f0f55b4df4d342d7e
---
 environments/undercloud.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index dbf586237c..6ecdee8039 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -1,7 +1,3 @@
-parameter_merge_strategies:
-  default: overwrite
-  UndercloudExtraConfig: deep_merge
-
 resource_registry:
   OS::TripleO::Services::Tmpwatch: ../deployment/logrotate/tmpwatch-install.yaml
   OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml