openstack/tripleo-heat-templates
Code Issues Proposed changes

Problematic nested quotes in hieradata file list

Browse Source 
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 e66a70df63)
This commit is contained in:
David Vallee Delisle 2021-02-05 19:51:55 -05:00 committed by Martin Schuppert
parent 5e4d71b213
commit e300018817
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overcloud.j2.yaml
View File

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