From a86f7affd465a928afc0077765d3f26822a0e668 Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Tue, 4 Feb 2020 22:30:29 -0600 Subject: [PATCH] retrieve keystone client through simpler api --- zaza/openstack/charm_tests/designate/__init__.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/zaza/openstack/charm_tests/designate/__init__.py b/zaza/openstack/charm_tests/designate/__init__.py index 66e2373..22683cc 100644 --- a/zaza/openstack/charm_tests/designate/__init__.py +++ b/zaza/openstack/charm_tests/designate/__init__.py @@ -43,15 +43,13 @@ class BaseDesignateTest(test_utils.OpenStackBaseTest): # Get keystone session cls.post_xenial_queens = os_release() >= os_release('xenial_queens') - keystone_api = 3 if cls.post_xenial_queens else 2 - cls.keystone_session = openstack_utils.get_overcloud_keystone_session() - cls.keystone = openstack_utils.get_keystone_session_client( - cls.keystone_session, keystone_api - ) + overcloud_auth = openstack_utils.get_overcloud_auth() + cls.keystone = openstack_utils.get_keystone_client(overcloud_auth) if cls.post_xenial_queens: + keystone_session = openstack_utils.get_overcloud_keystone_session() cls.designate = openstack_utils.get_designate_session_client( - session=cls.keystone_session + session=keystone_session ) cls.zones_list = cls.designate.zones.list cls.zones_delete = cls.designate.zones.delete