upload-swift-artifacts fails with: More than one endpoint exists with the name 'swift'.

[Dan Prince]

In 7d41589d59d42aa4f597d3787498130d1fdf5c43 we attempted to support old and new openstackclient but the logic is reversed. I now get the 'More than one endpoint exists with the name 'swift'.' error again because the older (unsupported) command is now executed first.

[Emilien Macchi (emilienm)]

https://review.openstack.org/#/c/362915/

[Dan Prince (dan-prince)]

Fixed by: https://review.openstack.org/#/c/362915/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/362915
Committed: https://git.openstack.org/cgit/openstack/tripleo-common/commit/?id=960dd971f1be94ade7db3f31077bac4383c7bd84
Submitter: Jenkins
Branch: master

commit 960dd971f1be94ade7db3f31077bac4383c7bd84
Author: Dan Prince <email address hidden>
Date: Tue Aug 30 10:31:06 2016 -0400

    Fix upload-swift-artifacts work new OSclient

    This resolves a regression in 7d41589d59d42aa4f597d3787498130d1fdf5c43
    where we again broke this shell script with newer version of
    openstackclient. In that commit we added an
    'openstack endpoint show swift' which again causes errors with
    the latest openstackclient.

    This patch reverses the logic so that we try to calculate the
    swift internal URL with the new command first. This won't error
    on the old version of openstackclient so everything should be happy
    I think.

    Change-Id: If46687dfb0f2ad2a116eae41422ea160f61026cd
    Closes-bug: #1618488

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-common 5.2.0 release.