[update/upgrade/ffwd] no-op removal does not take effect

[Jiří Stránský]

It seems that our approach of doing converges with --update-plan-only has no effect. The plan gets updated but the Heat stack never gets to know that, as a follow up stack operation (e.g. any `overcloud deploy`) will not use anything from the previously updated plan. The plan gets cleared and freshly re-uploaded.

This is a problem at least for parameter_defaults (e.g. resetting CephAnsiblePlaybook will never happen) but may be a problem for resource_registry too. (More investigation on resource_registry would be nice.)

The bottom line is that we probably need to do a stack update on all converge operations, and likely also do Ceph update/upgrade *before* converge, to save on the amount of stack updates we have to do.

[OpenStack Infra (hudson-openstack)]

Related 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)

[Jiří Stránský (jistr)]

Merged in master, last bit pending for queens: https://review.openstack.org/#/c/567243/