[FFWD] add the ceph_nfs short name to hiera data for the upgrade task fails

[Jose Luis Franco]

Launchpad created from : https://bugzilla.redhat.com/show_bug.cgi?id=1872851

The CephNFS hiera update fails with the error:
TASK [add the ceph_nfs short name to hiera data for the upgrade.] **************
Wednesday 26 August 2020 13:38:09 -0400 (0:00:00.108) 0:00:54.214 ******
ERROR! the role 'tripleo_upgrade_hiera' was not found in /var/lib/mistral/0989ea80-9eb4-4b7d-bfe5-317e3952f6ac/roles:/var/lib/mistral/0989ea80-9eb4-4b7d-bfe5-317e3952f6ac/roles:/root/.ansible/roles:/usr/share/ansible/tripleo-roles:/usr/share/ansible/roles:/etc/ansible/roles:/usr/share/openstack-tripleo-validations/roles:/var/lib/mistral/0989ea80-9eb4-4b7d-bfe5-317e3952f6ac:/var/lib/mistral/0989ea80-9eb4-4b7d-bfe5-317e3952f6ac

The error appears to be in '/var/lib/mistral/0989ea80-9eb4-4b7d-bfe5-317e3952f6ac/ControllerStorageNfs/upgrade_tasks_step1.yaml': line 69, column 13, but may
be elsewhere in the file depending on the exact syntax problem.

The offending line appears to be:

  - include_role:
      name: tripleo_upgrade_hiera
            ^ here

The role is located in /usr/share/ansible/roles/tripleo-upgrade-hiera

Version-Release number of selected component (if applicable):
tripleo-ansible-0.5.1-0.20200611113659.34b8fcc.el8ost.noarch

How reproducible:
100%

Steps to Reproduce:
1. upgrade an OSP13 with CephNFS to OSP 16.1

Actual results:
openstack overcloud upgrade run \
        --stack overcloud \
        --tags system_upgrade \
        --limit controller-0 \
        | tee oc-c0-system-upgrade.log

fails

Expected results:
The stage passes

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/train
Review: https://review.opendev.org/749088

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/749088
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=70f52b99225507d92add0398a044ed9928b4abad
Submitter: Zuul
Branch: stable/train

commit 70f52b99225507d92add0398a044ed9928b4abad
Author: Jose Luis Franco Arza <email address hidden>
Date: Mon Aug 31 18:39:36 2020 +0200

    [Train Only] Renamve tripleo_upgrade_hiera into tripleo-upgrade-hiera.

    When cherry-picking [0][1] it was missed that the tripleo_upgrade_hiera
    role in tripleo-ansible (stable/train) is named tripleo-upgrade-hiera.
    This is causing issues during the upgrade run command execution as it
    can't identify the role by tripleo_upgrade_hiera.

    [0] - I45e72bb598ef2157531919173e94ab36eb98ad16
    [1] - I8bc42fb758a333adc9cd65602b44fabee6fc4041

    Change-Id: I5a15cf1d90ecef37889fd36cbb5c8c37e3420670
    Closes-Bug: #1893677