Ceph upgrade prepare/converge env file aren't correct

[Jiří Stránský]

There's are issues with Ceph upgrade files:

* prepare tries to no-op DeploymentSteps, which shouldn't happen, we need firewall rules applied.

* we may need to pull it right after upgrade, before converge, so prepare should also undo "config download" in case the preceding upgrade was FFWD (see https://bugs.launchpad.net/tripleo/+bug/1767317 )

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/queens
Review: https://review.openstack.org/566019

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/564686
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=fc9d9ee49328b4745a6de02b0051d56f873d03cf
Submitter: Zuul
Branch: master

commit fc9d9ee49328b4745a6de02b0051d56f873d03cf
Author: Giulio Fidente <email address hidden>
Date: Fri Apr 27 08:53:32 2018 +0200

    Ensure config-download mappings are unset on ceph-upgrade

    Purpose is to ensure that any mapping previously used to enable
    config-download is reset to perform a regular Heat stack update on
    ceph-upgrade. We may need to do "update/upgrade/ffwd -> ceph ->
    converge" instead of the previously assumed "update/upgrade/ffwd ->
    converge -> ceph".

    This also removes the no-op of DeploymentSteps -- we need them enabled
    during Ceph upgrade as we need firewall rules applied.

    Co-Authored-By: Jiri Stransky <email address hidden>
    Closes-Bug: #1767318
    Related-Bug: #1767317
    Change-Id: I52312ffcd438c354872ab3c74138b47ae71aab4b

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/566019
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=24469e3c02747b7b6de6d61fcf2a8b9be67b370b
Submitter: Zuul
Branch: stable/queens

commit 24469e3c02747b7b6de6d61fcf2a8b9be67b370b
Author: Giulio Fidente <email address hidden>
Date: Fri Apr 27 08:53:32 2018 +0200

    Ensure config-download mappings are unset on ceph-upgrade

    Purpose is to ensure that any mapping previously used to enable
    config-download is reset to perform a regular Heat stack update on
    ceph-upgrade. We may need to do "update/upgrade/ffwd -> ceph ->
    converge" instead of the previously assumed "update/upgrade/ffwd ->
    converge -> ceph".

    This also removes the no-op of DeploymentSteps -- we need them enabled
    during Ceph upgrade as we need firewall rules applied.

    Co-Authored-By: Jiri Stransky <email address hidden>
    Closes-Bug: #1767318
    Related-Bug: #1767317
    Change-Id: I52312ffcd438c354872ab3c74138b47ae71aab4b
    (cherry picked from commit fc9d9ee49328b4745a6de02b0051d56f873d03cf)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 8.0.3 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 9.0.0.0b3 development milestone.