deployed-server: ec2 collector should not be enabled by default

[James Slagle]

When using deployed-server, the ec2 collector should not be enabled by default. It ends up getting enabled when the os-collect-config.conf is configured manually, but after polling for metadata from Heat, the os-collect-config.conf configuration embedded in the returned metadata enables the ec2 collector, which then gets rendered at /etc/os-collect-config.conf when os-apply-config is later run.

Although this doesn't break anything, it does cause repeated error messages in the log every 30s since the collector is not likely to be working when using deployed-server's.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/441333
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=00b82577f180d9cbdf0a80eb6f2155f100e1b835
Submitter: Jenkins
Branch: master

commit 00b82577f180d9cbdf0a80eb6f2155f100e1b835
Author: James Slagle <email address hidden>
Date: Fri Mar 3 11:21:11 2017 -0500

    Disable ec2 collector for deployed-server

    In the deployed-server metadata that configures os-collect-config, the
    ec2 collector should not be enabled. ec2 metadata is not typically
    available when using the deployed-server resource.

    Closes-Bug: #1669842
    Change-Id: I33e062b70fdf298908656a8ed3e62ac7cae16a37

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/heat 9.0.0.0b1 development milestone.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/451997
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=371f843eca4016359760b7fd0b0795c5d3159348
Submitter: Jenkins
Branch: stable/ocata

commit 371f843eca4016359760b7fd0b0795c5d3159348
Author: James Slagle <email address hidden>
Date: Fri Mar 3 11:21:11 2017 -0500

    Disable ec2 collector for deployed-server

    In the deployed-server metadata that configures os-collect-config, the
    ec2 collector should not be enabled. ec2 metadata is not typically
    available when using the deployed-server resource.

    Closes-Bug: #1669842
    Change-Id: I33e062b70fdf298908656a8ed3e62ac7cae16a37
    (cherry picked from commit 00b82577f180d9cbdf0a80eb6f2155f100e1b835)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/heat 8.0.2 release.

[Emilien Macchi (emilienm)]

There are no currently open reviews on this bug, changing the status back to the previous state and unassigning. If there are active reviews related to this bug, please include links in comments.

[Emilien Macchi (emilienm)]

This is an automated cleanup. This bug report has been closed because it
is older than 18 months and there is no open code change to fix this.
After this time it is unlikely that the circumstances which lead to
the observed issue can be reproduced.

If you can reproduce the bug, please:
* reopen the bug report (set to status "New")
* AND add the detailed steps to reproduce the issue (if applicable)
* AND leave a comment "CONFIRMED FOR: <RELEASE_NAME>"
  Only still supported release names are valid (FUTURE, PIKE, QUEENS, ROCKY, STEIN).
  Valid example: CONFIRMED FOR: FUTURE