Upgrade of compute Newton to Ocata failed during converge step, the UpgradeInitCommand isn't reset

[Marios Andreou]

As discussed in https://bugzilla.redhat.com/show_bug.cgi?id=1446299 we should unset the UpgradeInitCommand in case the operator has used that during their upgrade workflow. The UpgradeInitCommonCommand is already unset in the relevant environment file [1] so we should do the same for the UpgradeInitCommand on converge. Both of these are included in every deployment at [2] so we set them to '' until they are needed again.

[1] https://github.com/openstack/tripleo-heat-templates/blob/947a7148e807e74daf9e30e4e8c891d5bdacc69f/environments/major-upgrade-converge.yaml#L8
[2] https://github.com/openstack/tripleo-heat-templates/blob/ef82c3a010cf6161f1da1020698dbd38257f5a12/puppet/role.role.j2.yaml#L385-L406

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/460571
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=7d87b8225bd640fee4b55fd66e793391526f6d54
Submitter: Jenkins
Branch: master

commit 7d87b8225bd640fee4b55fd66e793391526f6d54
Author: marios <email address hidden>
Date: Thu Apr 27 16:51:42 2017 +0300

    Unset the UpgradeInitCommand on converge

    In the converge envs we unset the UpgradeInitCommon since we used
    that for the N..O upgrades workflow. However an operator may have
    also overridden the UpgradeInitCommand so we should unset that
    too.

    Closes-Bug: 1686918
    Change-Id: I3b316d04b78a4ab1e3f9f69948e42e6fb0ad6632

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/461028
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=cc9695e74e588a8aa35aa3850bb0b336906c78e0
Submitter: Jenkins
Branch: stable/ocata

commit cc9695e74e588a8aa35aa3850bb0b336906c78e0
Author: marios <email address hidden>
Date: Thu Apr 27 16:51:42 2017 +0300

    Unset the UpgradeInitCommand on converge

    In the converge envs we unset the UpgradeInitCommon since we used
    that for the N..O upgrades workflow. However an operator may have
    also overridden the UpgradeInitCommand so we should unset that
    too.

    Closes-Bug: 1686918
    Change-Id: I3b316d04b78a4ab1e3f9f69948e42e6fb0ad6632
    (cherry picked from commit 7d87b8225bd640fee4b55fd66e793391526f6d54)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 7.0.0.0b2 development milestone.

[OpenStack Infra (hudson-openstack)]

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