Merge "[CI][cli] use env variable to determine KeystoneV3"
This commit is contained in:
commit
33901857fe
@ -50,6 +50,12 @@ class DeploymentTestCase(unittest.TestCase):
|
||||
config["admin"]["username"])
|
||||
self.assertEqual(utils.TEST_ENV["OS_PASSWORD"],
|
||||
config["admin"]["password"])
|
||||
if "project_name" in config["admin"]:
|
||||
# keystone v3
|
||||
self.assertEqual(utils.TEST_ENV["OS_TENANT_NAME"],
|
||||
config["admin"]["project_name"])
|
||||
else:
|
||||
# keystone v2
|
||||
self.assertEqual(utils.TEST_ENV["OS_TENANT_NAME"],
|
||||
config["admin"]["tenant_name"])
|
||||
self.assertEqual(utils.TEST_ENV["OS_AUTH_URL"],
|
||||
|
Loading…
x
Reference in New Issue
Block a user