containerized undercloud upgrade fails to cleanup neutron dhcp

[Emilien Macchi]

http://logs.openstack.org/27/572027/3/check/tripleo-ci-centos-7-containerized-undercloud-upgrades/10d0022/logs/undercloud/home/zuul/undercloud_upgrade.log.txt.gz#_2018-06-15_19_43_19

When upgrading an undercloud to Rocky (containerized), it seems to fail (quite often in the tripleo gate) when cleaning up Neutron:

2018-06-15 19:43:19 | TASK [Stop and disable neutron_dhcp service] ***********************************
2018-06-15 19:43:19 | fatal: [centos-7-rax-dfw-0000166435]: FAILED! => {"changed": false, "failed": true, "msg": "Could not find the requested service neutron-dhcp-agent: host"}
2018-06-15 19:43:19 | to retry, use: --limit @/home/zuul/undercloud-ansible-wjiGSa/upgrade_steps_playbook.retry
2018-06-15 19:43:19 |
2018-06-15 19:43:19 | PLAY RECAP *********************************************************************
2018-06-15 19:43:19 | centos-7-rax-dfw-0000166435 : ok=115 changed=61 unreachable=0 failed=1

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/575855

[Emilien Macchi (emilienm)]

The root cause is because master isn't consistent, so we don't have https://github.com/openstack/tripleo-heat-templates/commit/029f500feedd01c12a2e9b24d4bab8f2a6c8beed in CI right now.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/575855
Committed: https://git.openstack.org/cgit/openstack/tripleo-quickstart/commit/?id=789aec0df625813d09b6642142d4721931291698
Submitter: Zuul
Branch: master

commit 789aec0df625813d09b6642142d4721931291698
Author: Emilien Macchi <email address hidden>
Date: Fri Jun 15 21:54:22 2018 +0000

    Revert "Revert "Revert "fs050: enable upgrade cleanup"""

    Related-Bug: #1777197
    This reverts commit 8f3feb8dfcad6c8305603f613b0fac3ae1df62bd.

    Change-Id: Ie9ee338b156a20623f631f1d5cc91da96ee7c418

[Emilien Macchi (emilienm)]

We are consistent on master, so have latest THT so the job pass again.