When used with OS::Heat::StructuredDeployment deployments are not stored in cache correctly

[Clint Byrum]

When the deployments key is exploded into individual json files, it is not stored correctly in the cache, as the cache update code assumes keys are always just collector names. This causes os-collect-config to re-execute forever when deployments are used.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/87124

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/87124
Committed: https://git.openstack.org/cgit/openstack/os-collect-config/commit/?id=77fb0651bc0b8668ad7dec49adec6e18b6a2588d
Submitter: Jenkins
Branch: master

commit 77fb0651bc0b8668ad7dec49adec6e18b6a2588d
Author: Clint Byrum <email address hidden>
Date: Sun Apr 13 09:55:58 2014 -0700

    Test that collect_all works when nothing changed

    This improves the test coverage for this very common case and sets up
    for a new test which will expose that we fail in this case for exploded
    deployments collected by the cfn collector.

    Change-Id: I74807107824f8795619207389c064e83580c1c87
    Related-Bug: #1307153

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/87139
Committed: https://git.openstack.org/cgit/openstack/os-collect-config/commit/?id=6198acbfcc5f0e7357137191c55783bfd2e66895
Submitter: Jenkins
Branch: master

commit 6198acbfcc5f0e7357137191c55783bfd2e66895
Author: Clint Byrum <email address hidden>
Date: Sun Apr 13 13:58:45 2014 -0700

    Commit changes to exploded deployments to cache

    Before this, the exploded deployments that the cfn collector produced
    would not ever be committed, and thus would always appear to have been
    changed. This resulted in os-collect-config running the command
    endlessly.

    This requires some refactoring so that we commit changes to the cache
    based on what was actually written, rather than just the static list of
    collectors.

    Closes-Bug: #1307153

    Change-Id: I618ef5d752ed6519e8b7bfc090de03f2f24e73ce