Fix tempest error on Apex
authorLinda Wang <wangwulin@huawei.com>
Thu, 11 Jan 2018 03:02:18 +0000 (03:02 +0000)
committerLinda Wang <wangwulin@huawei.com>
Thu, 11 Jan 2018 03:08:47 +0000 (03:08 +0000)
commitb73ef5c67c1fb56589627f273bfe28a194630c42
tree00f96148f56a2971ada23c4cb8001dacdba51aea
parentcc26b57d00b1d5dee299c9b47b25f8f472ac3eb8
Fix tempest error on Apex

1. Reconfigure v3_endpoint_type only when it is not None. It is
   adminURL by default.
2. Ignore the setting of api_v2_admin, as it only applies if api_v2
   is set to True.

Change-Id: I48b166bdb274467519390af3c1aa5ebf30b38c6d
Signed-off-by: Linda Wang <wangwulin@huawei.com>
functest/opnfv_tests/openstack/tempest/conf_utils.py