batch_upgrade_tasks not executed before upgrade_tasks

[Marios Andreou]

The ordering between batch_upgrade_tasks and upgrade_tasks is not being enforced.

For the N..O upgrades workflow [1] the batch_upgrade_tasks are meant to be used to execute those upgrade tasks that should be executed on one node at a time. These are also expected to be run before any of the rest of the upgrade_tasks are executed.

This ordering is currently broken - there is a review out at https://review.openstack.org/#/c/448602/ to fix it.

Filing this bug for more info and as we will need the fix into stable/ocata too

[1] https://docs.openstack.org/developer/tripleo-docs/post_deployment/upgrade.html#upgrading-the-overcloud-to-ocata-and-beyond

[Marios Andreou (marios-b)]

this is also discussed at https://bugzilla.redhat.com/show_bug.cgi?id=1437970

[Giulio Fidente (gfidente)]

I am testing a version which does not remove the conditions in https://review.openstack.org/452789

It seems to succeed on the first upgrade attempt, but not on a subsequent stack update.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/448602
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=299b9f532377a3a0c16ba9cb4fe92c637fc38eeb
Submitter: Jenkins
Branch: master

commit 299b9f532377a3a0c16ba9cb4fe92c637fc38eeb
Author: marios <email address hidden>
Date: Wed Mar 22 16:09:22 2017 +0200

    Enforce upgrade_batch_tasks before upgrade_tasks order

    If we really want upgrade_batch_tasks before the upgrade_tasks
    as described in the README then we should enforce the ordering

    Noticed this working on bug 1671504 upgrade tasks were being
    executed before batch upgrade tasks.

    Closes-Bug: 1678101
    Change-Id: Iaa1bce960a37c072b5f8441132705a6bb6eb6ede

[OpenStack Infra (hudson-openstack)]

Change abandoned by Giulio Fidente (<email address hidden>) on branch: master
Review: https://review.openstack.org/452789
Reason: Fixes for the bugs have been merged already and they remove the conditions which can tentatively being added back (without removing the fixes) using I5c8b0c4abfc0607f42fd3f2da9f5ef2702b1bbe1 instead

[OpenStack Infra (hudson-openstack)]

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

commit 7d86750a13198bcb2659f1aa5c64ef18d6be88fa
Author: marios <email address hidden>
Date: Wed Mar 22 16:09:22 2017 +0200

    Enforce upgrade_batch_tasks before upgrade_tasks order

    If we really want upgrade_batch_tasks before the upgrade_tasks
    as described in the README then we should enforce the ordering

    Noticed this working on bug 1671504 upgrade tasks were being
    executed before batch upgrade tasks.

    Closes-Bug: 1678101
    Change-Id: Iaa1bce960a37c072b5f8441132705a6bb6eb6ede
    (cherry picked from commit 299b9f532377a3a0c16ba9cb4fe92c637fc38eeb)

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit a19297a1bf114d48c4dadfb0678a3466f9e6de3a
Author: Giulio Fidente <email address hidden>
Date: Tue Apr 4 17:49:46 2017 +0200

    Add back Heat conditions in upgrade workflow

    By adding back the conditions we avoid the deployment of unneded
    software configs on nodes where we don't have any upgrade task to
    run, speeding up the upgrade process.

    Related-Bug: #1679486
    Related-Bug: #1678101
    Change-Id: I5c8b0c4abfc0607f42fd3f2da9f5ef2702b1bbe1