Merge "Use ansible group_vars for service_configs hieradata"

common/deploy-steps.j2

@@ -542,6 +542,7 @@ outputs:
                       - net_ip_map
                       - cloud_domain
                       - fqdn
+                      - service_configs
                   when: tripleo_role_name == '{{role.name}}'
               tags:
                 - overcloud

overcloud.j2.yaml

@@ -491,7 +491,6 @@ resources:
       type: json
       value:
         datafiles:
-          service_configs: {get_attr: [{{role.name}}ServiceConfigSettings, value]}
           {{role.name.lower()}}_extraconfig:
             map_merge:
               - sensu::subscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]}
@@ -1061,7 +1060,10 @@ outputs:
     value:
 {%- for role in roles %}
       {{role.name}}:
-        map_merge: {get_attr: [{{role.name}}, role_group_vars]}
+        map_merge:
+          list_concat:
+          - {get_attr: [{{role.name}}, role_group_vars]}
+          - [service_configs: {get_attr: [{{role.name}}ServiceConfigSettings, value]}]
 {%- endfor %}
   RoleNetHostnameMap:
     description: Mapping of each network to a list of hostnames for each role