Merge "Remove {{role.name}}MergedConfigSettings resource"

overcloud.j2.yaml

@@ -528,23 +528,6 @@ resources:
                     {% endfor %}
                 services: {get_attr: [{{role.name}}ServiceNames, value]}
 
-  {{role.name}}MergedConfigSettings:
-    type: OS::Heat::Value
-    properties:
-      type: json
-      value:
-        config_settings: {}
-        global_config_settings: {}
-        service_config_settings: {}
-        merged_config_settings:
-          map_merge:
-          - get_attr: [{{role.name}}ServiceConfigSettings, value]
-          - get_param: ExtraConfig
-  {%- if role.deprecated_param_extraconfig is defined %}
-          - get_param: {{role.deprecated_param_extraconfig}}
-  {%- endif %}
-          - get_param: {{role.name}}ExtraConfig
-
   # Filter any null/None service_names which may be present due to mapping
   # of services to OS::Heat::None
   {{role.name}}ServiceNames:
@@ -960,10 +943,7 @@ resources:
       EndpointMap: {get_attr: [EndpointMapData, value]}
       role_data:
 {%- for role in roles %}
-        {{role.name}}:
-          map_merge:
-          - {get_attr: [{{role.name}}ServiceChainRoleData, value]}
-          - {get_attr: [{{role.name}}MergedConfigSettings, value]}
+        {{role.name}}: {get_attr: [{{role.name}}ServiceChainRoleData, value]}
 {%- endfor %}
 {%- for role in roles %}
       {{role.name}}Count: {get_param: {{role.name}}Count}
@@ -1065,10 +1045,7 @@ outputs:
     description: The configuration data associated with each role
     value:
 {%- for role in roles %}
-      {{role.name}}:
-        map_merge:
-        - {get_attr: [{{role.name}}ServiceChainRoleData, value]}
-        - {get_attr: [{{role.name}}MergedConfigSettings, value]}
+      {{role.name}}: {get_attr: [{{role.name}}ServiceChainRoleData, value]}
 {%- endfor %}
   RoleConfig:
     description: The configuration workflows associated with each role