From e30001881710130c732bb2e6de29a61d40daff1e Mon Sep 17 00:00:00 2001
From: David Vallee Delisle <dvd@redhat.com>
Date: Fri, 5 Feb 2021 19:51:55 -0500
Subject: [PATCH] Problematic nested quotes in hieradata file list

We shouldn't be double quoting the hieradata files in overcloud.j2.yaml.

Related: https://bugzilla.redhat.com/1924862
Change-Id: I042c26ac5a488bbd9f9d3802cfe6ea95c7ab0380
(cherry picked from commit e66a70df635e51aed15f7c81ccdbe97282c516b2)
---
 overcloud.j2.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 2f75de35bb..1847583d03 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -707,7 +707,7 @@ resources:
             - {get_param: {{role.name}}ExtraConfig}
         extraconfig: {get_param: ExtraConfig}
         hieradata_files:
-          - '"%{::uuid}"'
+          - '%{::uuid}'
           - fqdn
           - docker_puppet # Optionally provided by container-puppet.sh
           - ansible_managed
@@ -723,7 +723,7 @@ resources:
           - all_nodes # provided by tripleo_hieradata
           - vip_data # provided by tripleo_hieradata
           - net_ip_map
-          - '"%{::osfamily}"'
+          - '%{::osfamily}'
           # The following are required for compatibility with the Controller role
           # where some vendor integrations added hieradata via ExtraConfigPre
           - neutron_bigswitch_data # Optionally provided by Controller/ComputeExtraConfigPre