Browse Source

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 e66a70df63)
(cherry picked from commit e300018817)
changes/96/775096/1
David Vallee Delisle 4 months ago
parent
commit
633ad77811
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      overcloud.j2.yaml

+ 2
- 2
overcloud.j2.yaml View File

@ -614,7 +614,7 @@ resources:
- {get_param: {{role.name}}ExtraConfig}
extraconfig: {get_param: ExtraConfig}
hieradata_files:
- '"%{::uuid}"'
- '%{::uuid}'
- fqdn
- docker_puppet # Optionally provided by container-puppet.py
- ansible_managed
@ -630,7 +630,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


Loading…
Cancel
Save