deployed-server: get-occ-config.sh deletes packaged os-collect-config.conf template

[James Slagle]

In order to prevent /etc/os-collect-config.conf from getting overidden by os-apply-config after it's been configured by the heat-agents configuration script for deployed servers (get-occ-config.sh), we have to delete the configuration file template at /usr/libexec/os-apply-config/templates/etc/os-collect-config.conf

The issue with that approach is that the template file is now a packaged file, so on package update, it could get recreated, then os-apply-config would overwrite the agent configuration breaking the communication between deployed-server's and the undercloud Heat.

Instead of directly configuring the file with get-occ-config.sh and having to delete the template, we should just inject the configuration data as a data source for the local connector. That way when the file is rendered from the template it will have the correct configuration.

[James Slagle (james-slagle)]

There was an initial patch from sbaker to do this:
https://review.openstack.org/#/c/405032/

but it needs to be updated to use the request collector instead of the heat collector.

[James Slagle (james-slagle)]

I just updated https://review.openstack.org/405032 to address this issue

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/405032
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=5e934cd9b8b17c62a2f8729a1e6f50b9b9001ff8
Submitter: Jenkins
Branch: master

commit 5e934cd9b8b17c62a2f8729a1e6f50b9b9001ff8
Author: Steve Baker <email address hidden>
Date: Thu Dec 1 01:02:54 2016 +0000

    Use the local collector to bootstrap deployed servers

    os-collect-config is already configured to use json files in
    /var/lib/os-collect-config/local-data/ as a data source, so this can
    be used in the deployed-server get-occ-config.sh to copy in the
    required json to generate the required os-collect-config.conf.

    Co-Authored-By: James Slagle <email address hidden>
    Closes-Bug: #1679705
    Change-Id: Ibde9e6bf360277d4ff64f66d637a5c7f0360e754

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/454341

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 7.0.0.0b1 development milestone.

[OpenStack Infra (hudson-openstack)]

Change abandoned by James Slagle (<email address hidden>) on branch: stable/ocata
Review: https://review.openstack.org/454341
Reason: i don't anticipate fixing this for ocata at this point

[OpenStack Infra (hudson-openstack)]

Change abandoned by Alex Schultz (<email address hidden>) on branch: stable/ocata
Review: https://review.openstack.org/454341
Reason: Rather than tackle the local collector, I've split off a change just for the service enable https://review.openstack.org/523245