Allow bootstrap.py tripleo to work with Older OSP releases

Change-Id: Ib744e6db95f9f46a1019d70c35351dca419e5168
cloud-bulldozer · Jul 2, 2018 · 4be2304 · 4be2304
1 parent 0231ea9
commit 4be2304
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ansible/bootstrap/tripleo.py b/ansible/bootstrap/tripleo.py
@@ -64,8 +64,12 @@ def bootstrap(self, working_dir, cliargs):
         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"]