[updates pike] update fails with error "The Resource Type (OS::TripleO::Services::ManilaBackendGeneric) could not be found"

[Jose Luis Franco]

the overcloud_update_setup.sh script exit with an error:
"The Resource Type (OS::TripleO::Services::ManilaBackendGeneric) could not be found"

Version-Release number of selected component (if applicable):

How reproducible:

Steps to Reproduce:
1. instal osp12 GA
2. Update to passed_phase2 (in this test 2018-06-29.1)
3.

Actual results:
update fails

Expected results:

Additional info:
see attached tar for home/stack files,
more logs and sosreport can be found in the job
http://staging-jenkins2-qe-playground.usersys.redhat.com/view/DFG/view/upgrades/view/update/job/DFG-upgrades-updates-12_director-rhel-7.4-virthost-3cont_2comp_3ceph-ipv4-vxlan-os-7.5/3/artifact/

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/587413

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/pike
Review: https://review.openstack.org/587723

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/587413
Committed: https://git.openstack.org/cgit/openstack/tripleo-upgrade/commit/?id=ba9879a93209ba25fdb9a5dd1d00aa3a5f33a9bf
Submitter: Zuul
Branch: master

commit ba9879a93209ba25fdb9a5dd1d00aa3a5f33a9bf
Author: Jose Luis Franco Arza <email address hidden>
Date: Tue Jul 31 15:10:13 2018 +0200

    Adjust roles_data also for updates.

    During the update prepare process, if
    some of the services defined in the roles
    data where deprecated in the version to
    update to, an error will be retrieved during
    container image downloading as the service
    is not present anymore. This patch enables
    the roles_data adjusting, which was run in
    upgrades, also in updates.

    Change-Id: I1e1fc6471525855fb09280131e7847f21b1a74d8
    Related-Bug: #1784624

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/587723
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=223ff7805057df22eb32dab28d25e95443cf1d8b
Submitter: Zuul
Branch: stable/pike

commit 223ff7805057df22eb32dab28d25e95443cf1d8b
Author: Jose Luis Franco Arza <email address hidden>
Date: Wed Aug 1 10:53:49 2018 +0200

    [Pike only] ManilaBackendGeneric nooped to avoid deprecated error.

    ManilaBackendGeneric service has been deprecated
    in Pike release. But if pike version prior to the
    service deprecation was installed and then a minor
    update is performed to latest Pike an error will
    be returned as the service is not found anymore.
    This patch sets the service to OS::Heat::None to
    bypass this issue.

    Closes-Bug: #1784624
    Change-Id: Ia3a55133f9f11eb8678eeff7a4062d19318aa217

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/queens
Review: https://review.opendev.org/694146

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/694146
Committed: https://git.openstack.org/cgit/openstack/tripleo-upgrade/commit/?id=64e87eab93c3f1641674ffe475046bcce0ad14e4
Submitter: Zuul
Branch: stable/queens

commit 64e87eab93c3f1641674ffe475046bcce0ad14e4
Author: Jose Luis Franco Arza <email address hidden>
Date: Tue Jul 31 15:10:13 2018 +0200

    Adjust roles_data also for updates.

    During the update prepare process, if
    some of the services defined in the roles
    data where deprecated in the version to
    update to, an error will be retrieved during
    container image downloading as the service
    is not present anymore. This patch enables
    the roles_data adjusting, which was run in
    upgrades, also in updates.

    Change-Id: I1e1fc6471525855fb09280131e7847f21b1a74d8
    Related-Bug: #1784624
    (cherry picked from commit ba9879a93209ba25fdb9a5dd1d00aa3a5f33a9bf)