openstack
/
charm-barbican
Code Issues Proposed changes

Merge "Add back in keystone v3 support for basic_deployment.py"

This commit is contained in:
Jenkins 2017-08-25 20:14:36 +00:00 committed by Gerrit Code Review
parent 6fb7538e14 f492bb250c
commit 406db95604
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/tests/basic_deployment.py
View File

@ -106,10 +106,22 @@ class BarbicanBasicDeployment(OpenStackAmuletDeployment):
self._get_openstack_release_string()))
# Authenticate admin with keystone endpoint
self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
user='admin',
password='openstack',
tenant='admin')
if self._keystone_version == '2':
self.keystone = u.authenticate_keystone_admin(
self.keystone_sentry,
user='admin',
password='openstack',
tenant='admin')
elif self._keystone_version == '3':
# use default admin values in u.authenticate_keystone_admins()
# for user_domain_name, etc.
self.keystone = u.authenticate_keystone_admin(
self.keystone_sentry,
user='admin',
password='openstack',
api_version=3)
else:
raise RuntimeError("keystone version must be '2' or '3'")
def test_100_services(self):
"""Verify the expected services are running on the corresponding