Comment 3 for bug 1659540

Note: came here from https://bugzilla.redhat.com/show_bug.cgi?id=1416834 - in the end the review at /#/c/425955/ from comment #1 above was abandoned

Instead we landed https://review.openstack.org/#/c/426241/ I326a2816b6c47b2ba00c33a42ce6e452c5a74dce (openstack/heat-agents)

AFAICS we still need to cherrypick this to ocata, as I can't see it in [3] and my just upgraded OSP11 undercloud with openstack-heat-agents-1.0.0-2.el7ost.noarch doesn't have the fix. I just posted the cherrypick at https://review.openstack.org/#/c/450195/

As discussed on the openstack-dev mailing list at [1] we remove any existing data during the newton to ocata upgrade with [2] so the remaining cherrypick is just for deployments starting at ocata

thanks

[1] http://lists.openstack.org/pipermail/openstack-dev/2017-January/110922.html we
[2] https://github.com/openstack/tripleo-heat-templates/blob/stable/ocata/environments/major-upgrade-composable-steps.yaml#L10-L15
[3] https://github.com/openstack/heat-agents/blob/stable/ocata/heat-config-hiera/install.d/hook-hiera.py