tripleo.sh upgrade command should not use old scenario0001 environment file

[Saravanan KR]

2017-04-23 19:08:56.436293 | tripleo.sh -- Upgrade command arguments: -e /usr/share/openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml --libvirt-type=qemu -t 90 -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e /opt/stack/new/ocata/usr/share/openstack-tripleo-heat-templates/ci/environments/scenario001-multinode.yaml --compute-scale 0 --overcloud-ssh-user jenkins --validation-errors-nonfatal -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-bootstrap-environment-centos.yaml --libvirt-type=qemu -t 90 -r /opt/stack/new/tripleo-ci/test-environments/upgrade_roles_data.yaml --overcloud-ssh-user jenkins --validation-errors-nonfatal -e /usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/services/sahara.yaml -e /usr/share/openstack-tripleo-heat-templates/ci/environments/scenario001-multinode.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/major-upgrade-composable-steps.yaml -e /home/jenkins/init-repo.yaml --templates /usr/share/openstack-tripleo-heat-templates

During upgrade, the ocata environment file (/opt/stack/new/ocata/usr/share/openstack-tripleo-heat-templates/ci/environments/scenario001-multinode.yaml) is being added along with the master environment file.

In case of removing a mapping in master, the mapping will be still old instead of referring from the resource-registry. The issue in detail, the service PankoApi is mapped in the ocata scenario001 environment file [1]. But this mapping has been removed in the master scenario001 environment file [2]. Since we are using old environment file PankoApi is till pointing to the ocata service file and it is not picking the one from the master.

Because of this new changes in the service file is not picked, the role-specifc feature patch [3]raised this issue to light.

[1] https://github.com/openstack/tripleo-heat-templates/blob/stable/ocata/ci/environments/scenario001-multinode.yaml#L7
[2] https://github.com/openstack/tripleo-heat-templates/blob/master/ci/environments/scenario001-multinode.yaml
[3] https://review.openstack.org/#/c/437956/

[Emilien Macchi (emilienm)]

I'm not sure about that one, I think we use the new one the last time I checked.

[Saravanan KR (skramaja)]

@Emilien, We also use the use new one. But since the old old is also in the upgrade command, it is causing the problem.

[OpenStack Infra (hudson-openstack)]

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

commit 41c7e39da71fef916f176e2e11a7d15e94344475
Author: Saravanan KR <email address hidden>
Date: Mon Apr 24 11:09:56 2017 +0530

    Upgrade failure when service parameter is changed for PankoApi

    scenario001 env in ocata has mapped PankoApi locally and it
    has been removed master scenario001 env file. In tripleo.sh
    upgrade command, both old (ocata) and new (master) env files
    are included, because of which new service file is not used,
    as it has been removed. This change is to add the PankoApi
    mapping back to scenario001 env file for now. Actual fix
    will be remove old env file from upgrade command of tripleo.sh.

    Partial-Bug: #1685759
    Change-Id: I4a8ee38d990a1980eea6ec63f2780357d040ded4

[Alex Schultz (alex-schultz)]

As we've moved to oooq over tripleo.sh for most cases, I don't think there's things to be fixed. If this is still an issue, please reopen the bug.