From 661b125e1c09e631d2dce19772d5169d372fbbff Mon Sep 17 00:00:00 2001
From: Sebastian Rieger <sebastian.rieger@informatik.hs-fulda.de>
Date: Wed, 20 Apr 2022 17:45:09 +0200
Subject: [PATCH] removed domain name from conn init, as we currently only use
 the default domain anyway

---
 demo1-getting-started.py           | 11 +++++------
 demo2-instance-with-init-script.py |  6 +++---
 demo3-microservice.py              |  6 +++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/demo1-getting-started.py b/demo1-getting-started.py
index 1a872c6..997bff6 100644
--- a/demo1-getting-started.py
+++ b/demo1-getting-started.py
@@ -37,7 +37,7 @@ ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
 # default region
 region_name = 'RegionOne'
 # domain to use, "default" for local accounts, "hsfulda" for RZ LDAP, e.g., using fdaiXXXX as auth_username
-domain_name = "default"
+# domain_name = "default"
 
 
 def main():
@@ -46,8 +46,7 @@ def main():
     auth_password = "demo"
 
     # instantiate a connection to the OpenStack private cloud
-    # make sure to include ex_domain_name and ex_force_auth_version='3.x_password', as they are needed in our
-    # environment
+    # make sure to include ex_force_auth_version='3.x_password', as needed in our environment
     provider = get_driver(Provider.OPENSTACK)
 
     print("Opening connection to %s as %s..." % (auth_url, auth_username))
@@ -57,13 +56,13 @@ def main():
                     ex_force_auth_url=auth_url,
                     ex_force_auth_version='3.x_password',
                     ex_tenant_name=project_name,
-                    ex_force_service_region=region_name,
-                    ex_domain_name=domain_name)
+                    ex_force_service_region=region_name)
+    #               ex_domain_name=domain_name)
 
     print("Getting images and selecting desired one...")
     print("=========================================================================")
 
-    # get a list of images offered in the cloud context (e.g. Ubuntu 14.04, Ubuntu 16.04, cirros, ...)
+    # get a list of images offered in the cloud context (e.g. Ubuntu 20.04, cirros, ...)
     images = conn.list_images()
     image = ''
     for img in images:
diff --git a/demo2-instance-with-init-script.py b/demo2-instance-with-init-script.py
index c86eca2..be59d5e 100644
--- a/demo2-instance-with-init-script.py
+++ b/demo2-instance-with-init-script.py
@@ -36,7 +36,7 @@ flavor_name = 'm1.small'
 # default region
 region_name = 'RegionOne'
 # domain to use, "default" for local accounts, "hsfulda" for RZ LDAP, e.g., using fdaiXXXX as auth_username
-domain_name = "default"
+# domain_name = "default"
 
 
 def main():
@@ -64,8 +64,8 @@ def main():
                     ex_force_auth_url=auth_url,
                     ex_force_auth_version='3.x_password',
                     ex_tenant_name=project_name,
-                    ex_force_service_region=region_name,
-                    ex_domain_name=domain_name)
+                    ex_force_service_region=region_name)
+    #               ex_domain_name=domain_name)
 
     ###########################################################################
     #
diff --git a/demo3-microservice.py b/demo3-microservice.py
index 68b4300..0139106 100644
--- a/demo3-microservice.py
+++ b/demo3-microservice.py
@@ -40,7 +40,7 @@ flavor_name = 'm1.small'
 # default region
 region_name = 'RegionOne'
 # domain to use, "default" for local accounts, "hsfulda" for RZ LDAP, e.g., using fdaiXXXX as auth_username
-domain_name = "default"
+# domain_name = "default"
 
 
 def main():
@@ -68,8 +68,8 @@ def main():
                     ex_force_auth_url=auth_url,
                     ex_force_auth_version='3.x_password',
                     ex_tenant_name=project_name,
-                    ex_force_service_region=region_name,
-                    ex_domain_name=domain_name)
+                    ex_force_service_region=region_name)
+    #               ex_domain_name=domain_name)
 
     ###########################################################################
     #
-- 
GitLab