deployments merging only occurs with the cfn collector

[Steve Baker]

the heat and request collectors can also be used to poll heat for metadata, so the deployments merging needs to be applied to those collectors too.

See http://git.openstack.org/cgit/openstack/os-collect-config/tree/os_collect_config/cfn.py#n137

[James Slagle (james-slagle)]

hey Steve, I'm trying to triage this one. Is this something we need to do in the near term? Is it needed to support any of the Heat+Puppet work ongoing in the templates?

[Steve Baker (steve-stevebaker)]

This will need to happen in the following scenario:
- moving to Swift TempURLs for metadata polling (server resource software_config_transport:POLL_TEMP_URL, occ request collector, needs swift in the undercloud )
- heat puppet templates which still have config resources with group:os-apply-config

If the group:os-apply-config config resources end up getting replaced with pure hiera/puppet config resources then the change isn't urgent

[Clint Byrum (clint-fewbar)]

Seeing as the cfn API isn't always going to be available, it seems paramount that heat do merging too.

[Steve Baker (steve-stevebaker)]

On 01/03/15 06:28, Clint Byrum wrote:
> Seeing as the cfn API isn't always going to be available, it seems
> paramount that heat do merging too.
>
The heat and request collectors both need to merge

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/183355

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/183356