With Heat software-config we should not drop the 'deployments' map by default when we explode it into other parts.

[Clint Byrum]

Currently if we detect a structured software deployment, we break up the 'deployments' into individual json files and then delete the deployments mapping.

This, however, breaks non structured deployment resources when they want to use os-collect-config.

We should just leave the 'deployments' mapping in the main cfn metadata that is written out.

[OpenStack Infra (hudson-openstack)]

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

[Openstack Gerrit (openstack-gerrit)]

Reviewed: https://review.openstack.org/83837
Committed: https://git.openstack.org/cgit/openstack/os-collect-config/commit/?id=8cfe571c709616ecade398221827e72944b9d547
Submitter: Jenkins
Branch: master

commit 8cfe571c709616ecade398221827e72944b9d547
Author: Clint Byrum <email address hidden>
Date: Fri Mar 28 10:31:03 2014 -0700

    Restore 'deployments' key to cfn Metadata

    In recent changes support was added to explode the deployment key into
    multiple json files for merging by os-apply-config. But this breaks
    other users who want direct access to the full deployments structure.

    There seems to be no real reason to delete the key other than tidiness,
    so we will stop deleting it from the main cfn structure.

    Change-Id: Icf9479376e32c3ad8f9be29359e6100c1aeda2a5
    Closes-Bug: #1299110