From 3cca90ec336282cb047d04dde14063f488c3a8cb Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 3 Oct 2016 17:28:48 +0300 Subject: [PATCH] Convert all Keystone-specific configs to nested Change-Id: Ic16f582a76d0dbf15ecdfe707f338f261300d4ac Depends-On: I393f8898657543a8c4536159e9a6d773b13cefbf --- fuel_ccp_entrypoint/start_script.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fuel_ccp_entrypoint/start_script.py b/fuel_ccp_entrypoint/start_script.py index 6285ffe..1f66790 100644 --- a/fuel_ccp_entrypoint/start_script.py +++ b/fuel_ccp_entrypoint/start_script.py @@ -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