From 4be23046b854dd88f2a0d139ab0d788546175d41 Mon Sep 17 00:00:00 2001 From: akrzos Date: Mon, 2 Jul 2018 13:59:09 -0400 Subject: [PATCH] Allow bootstrap.py tripleo to work with Older OSP releases Change-Id: Ib744e6db95f9f46a1019d70c35351dca419e5168 --- ansible/bootstrap/tripleo.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ansible/bootstrap/tripleo.py b/ansible/bootstrap/tripleo.py index 63e01f399..7e98ce995 100644 --- a/ansible/bootstrap/tripleo.py +++ b/ansible/bootstrap/tripleo.py @@ -64,8 +64,12 @@ class tripleo(object): os_username = os.environ["OS_USERNAME"] os_password = os.environ["OS_PASSWORD"] os_auth_url = os.environ["OS_AUTH_URL"] - os_user_domain_name = os.environ["OS_USER_DOMAIN_NAME"] - os_project_domain_name = os.environ["OS_PROJECT_DOMAIN_NAME"] + os_user_domain_name = None + os_project_domain_name = None + if "OS_USER_DOMAIN_NAME" in os.environ: + os_user_domain_name = os.environ["OS_USER_DOMAIN_NAME"] + if "OS_PROJECT_DOMAIN_NAME" in os.environ: + os_project_domain_name = os.environ["OS_PROJECT_DOMAIN_NAME"] if "OS_PROJECT_NAME" in os.environ: project_name = os.environ["OS_PROJECT_NAME"]