Convert all Keystone-specific configs to nested

Change-Id: Ic16f582a76d0dbf15ecdfe707f338f261300d4ac
Depends-On: I393f8898657543a8c4536159e9a6d773b13cefbf
This commit is contained in:
Yuriy Taraday 2016-10-03 17:28:48 +03:00
parent 337a8fe326
commit 3cca90ec33
1 changed files with 4 additions and 4 deletions

View File

@ -163,11 +163,11 @@ def openstackclient_preexec_fn():
def result():
os.environ["OS_IDENTITY_API_VERSION"] = "3"
os.environ["OS_PROJECT_DOMAIN_NAME"] = 'default'
os.environ["OS_PASSWORD"] = VARIABLES['openstack_user_password']
os.environ["OS_USERNAME"] = VARIABLES['openstack_user_name']
os.environ["OS_PROJECT_NAME"] = VARIABLES['openstack_project_name']
os.environ["OS_PASSWORD"] = VARIABLES['openstack']['user_password']
os.environ["OS_USERNAME"] = VARIABLES['openstack']['user_name']
os.environ["OS_PROJECT_NAME"] = VARIABLES['openstack']['project_name']
os.environ["OS_AUTH_URL"] = 'http://%s:%s/v3' % (
address('keystone'), VARIABLES['keystone_admin_port'])
address('keystone'), VARIABLES['keystone']['admin_port'])
return result