commit 7137cae523c57638eefb5a1f7b5ea73ecd38c573
Author: James Slagle <email address hidden>
Date: Fri Aug 23 10:43:58 2019 -0400
Restore AllNodesExtraMapData
This commit is the same as I890bbef764b6bae7cb71cfedaff2ce17829737fb, which was
previously applied to tripleo-common, but lost in the migration to
tripleo-ansible.
Commit a7661065743086961b8ef93056b810e7d2a49eda removed the
all-nodes-config.j2.yaml Heat template. This template had the support
for specifying hieradata to merge into the all_nodes hieradata via the
AllNodesExtraMapData.
This commit restores the merge logic so that the merged hieradata from
the parameter value and the calculated hieradata is rendered in
all_nodes.json.
Reviewed: https:/ /review. opendev. org/678247 /git.openstack. org/cgit/ openstack/ tripleo- ansible/ commit/ ?id=7137cae523c 57638eefb5a1f7b 5ea73ecd38c573
Committed: https:/
Submitter: Zuul
Branch: master
commit 7137cae523c5763 8eefb5a1f7b5ea7 3ecd38c573
Author: James Slagle <email address hidden>
Date: Fri Aug 23 10:43:58 2019 -0400
Restore AllNodesExtraMa pData
This commit is the same as I890bbef764b6ba e7cb71cfedaff2c e17829737fb, which was ansible.
previously applied to tripleo-common, but lost in the migration to
tripleo-
Commit a76610657430869 61b8ef93056b810 e7d2a49eda removed the nodes-config. j2.yaml Heat template. This template had the support raMapData.
all-
for specifying hieradata to merge into the all_nodes hieradata via the
AllNodesExt
This commit restores the merge logic so that the merged hieradata from
the parameter value and the calculated hieradata is rendered in
all_nodes.json.
Change-Id: I49948f8d74c384 6321af4f423a489 1a71d0fabdc
Closes-Bug: #1839546