Comment 2 for bug 1808974

Reviewed: https://review.openstack.org/625821
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=033e6f70811f4c5552fb814a2a9cb805110fb8cc
Submitter: Zuul
Branch: stable/rocky

commit 033e6f70811f4c5552fb814a2a9cb805110fb8cc
Author: Jose Luis Franco Arza <email address hidden>
Date: Wed Dec 5 15:09:07 2018 +0100

    Perform docker reconfiguration on upgrade_tasks.

    The container-registry role is idempotent in a way that the
    restarting of the docker service will be done only if some
    configuration value has changed.
    During the upgrade, host_prep_tasks are being run and if the
    new templates bring some configuration change then the Docker
    service gets restarted. The issue is the point at which they
    get restarted, which is after the upgrade_tasks have already
    run and prior to the deploy_tasks. This is causing issues with
    Pacemaker handled resources.

    For that reason, we include the very same task running in host_prep_tasks
    into upgrade_tasks for the docker and docker-registry services,
    forcing the Docker service reconfiguration to happen during
    upgrade_tasks instead of at a latter point.

    This patch also fixes the typo included in the master branch patch
    I5e6ca987c01ff72a3c7e8900f9572024521164de that caused LP#1808974.

    Closes-Bug: #1807418
    Related-Bug: #1808974
    Change-Id: I5e6ca987c01ff72a3c7e8900f9572024521164de
    (cherry picked from commit 5bc5ae944a32d5c24090a4c5f5e44c64c2879c1a)