diff options
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 5 | ||||
| -rwxr-xr-x | functest/utils/openstack_clean.py | 1 | ||||
| -rwxr-xr-x | functest/utils/openstack_snapshot.py | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 15365ccf..4eb5661e 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -290,6 +290,11 @@ def configure_tempest_update_params(tempest_conf_file, config.set('identity', 'password', CONST.__getattribute__('tempest_identity_user_password')) config.set('identity', 'region', 'RegionOne') + if os_utils.is_keystone_v3(): + auth_version = 'v3' + else: + auth_version = 'v2' + config.set('identity', 'auth_version', auth_version) config.set( 'validation', 'ssh_timeout', CONST.__getattribute__('tempest_validation_ssh_timeout')) diff --git a/functest/utils/openstack_clean.py b/functest/utils/openstack_clean.py index cdd91852..0ce08798 100755 --- a/functest/utils/openstack_clean.py +++ b/functest/utils/openstack_clean.py @@ -425,6 +425,7 @@ def main(): separator() remove_tenants(keystone_client, default_tenants) separator() + return 0 if __name__ == '__main__': diff --git a/functest/utils/openstack_snapshot.py b/functest/utils/openstack_snapshot.py index 8f1d3b9b..233c316a 100755 --- a/functest/utils/openstack_snapshot.py +++ b/functest/utils/openstack_snapshot.py @@ -160,6 +160,7 @@ def main(): % yaml_file.read()) logger.debug("NOTE: These objects will NOT be deleted after " + "running the test.") + return 0 if __name__ == '__main__': |