From 5b2d2795a8aac2c34f846d1719bfe9d7e95f5c2d Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Tue, 30 Jul 2019 21:38:38 +0530
Subject: [PATCH] Use ansible group_vars for service_configs hieradata

Change-Id: Ifa05dc0bce634ad06efa7f4658845c8d6d044818
Depends-On: https://review.opendev.org/#/c/673727
---
 common/deploy-steps.j2 | 1 +
 overcloud.j2.yaml      | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 1685afe650..f45b16f43c 100644
--- a/common/deploy-steps.j2
+++ b/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
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index d4f3219ac7..1c01a744de 100644
--- a/overcloud.j2.yaml
+++ b/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