removed domain name from conn init, as we currently only use the default domain anyway
This commit is contained in:
		@@ -37,7 +37,7 @@ ubuntu_image_name = "Ubuntu 18.04 - Bionic Beaver - 64-bit - Cloud Based Image"
 | 
				
			|||||||
# default region
 | 
					# default region
 | 
				
			||||||
region_name = 'RegionOne'
 | 
					region_name = 'RegionOne'
 | 
				
			||||||
# domain to use, "default" for local accounts, "hsfulda" for RZ LDAP, e.g., using fdaiXXXX as auth_username
 | 
					# 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():
 | 
					def main():
 | 
				
			||||||
@@ -46,8 +46,7 @@ def main():
 | 
				
			|||||||
    auth_password = "demo"
 | 
					    auth_password = "demo"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # instantiate a connection to the OpenStack private cloud
 | 
					    # 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
 | 
					    # make sure to include ex_force_auth_version='3.x_password', as needed in our environment
 | 
				
			||||||
    # environment
 | 
					 | 
				
			||||||
    provider = get_driver(Provider.OPENSTACK)
 | 
					    provider = get_driver(Provider.OPENSTACK)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    print("Opening connection to %s as %s..." % (auth_url, auth_username))
 | 
					    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_url=auth_url,
 | 
				
			||||||
                    ex_force_auth_version='3.x_password',
 | 
					                    ex_force_auth_version='3.x_password',
 | 
				
			||||||
                    ex_tenant_name=project_name,
 | 
					                    ex_tenant_name=project_name,
 | 
				
			||||||
                    ex_force_service_region=region_name,
 | 
					                    ex_force_service_region=region_name)
 | 
				
			||||||
                    ex_domain_name=domain_name)
 | 
					    #               ex_domain_name=domain_name)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    print("Getting images and selecting desired one...")
 | 
					    print("Getting images and selecting desired one...")
 | 
				
			||||||
    print("=========================================================================")
 | 
					    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()
 | 
					    images = conn.list_images()
 | 
				
			||||||
    image = ''
 | 
					    image = ''
 | 
				
			||||||
    for img in images:
 | 
					    for img in images:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,7 +36,7 @@ flavor_name = 'm1.small'
 | 
				
			|||||||
# default region
 | 
					# default region
 | 
				
			||||||
region_name = 'RegionOne'
 | 
					region_name = 'RegionOne'
 | 
				
			||||||
# domain to use, "default" for local accounts, "hsfulda" for RZ LDAP, e.g., using fdaiXXXX as auth_username
 | 
					# 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():
 | 
					def main():
 | 
				
			||||||
@@ -64,8 +64,8 @@ def main():
 | 
				
			|||||||
                    ex_force_auth_url=auth_url,
 | 
					                    ex_force_auth_url=auth_url,
 | 
				
			||||||
                    ex_force_auth_version='3.x_password',
 | 
					                    ex_force_auth_version='3.x_password',
 | 
				
			||||||
                    ex_tenant_name=project_name,
 | 
					                    ex_tenant_name=project_name,
 | 
				
			||||||
                    ex_force_service_region=region_name,
 | 
					                    ex_force_service_region=region_name)
 | 
				
			||||||
                    ex_domain_name=domain_name)
 | 
					    #               ex_domain_name=domain_name)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ###########################################################################
 | 
					    ###########################################################################
 | 
				
			||||||
    #
 | 
					    #
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,7 +40,7 @@ flavor_name = 'm1.small'
 | 
				
			|||||||
# default region
 | 
					# default region
 | 
				
			||||||
region_name = 'RegionOne'
 | 
					region_name = 'RegionOne'
 | 
				
			||||||
# domain to use, "default" for local accounts, "hsfulda" for RZ LDAP, e.g., using fdaiXXXX as auth_username
 | 
					# 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():
 | 
					def main():
 | 
				
			||||||
@@ -68,8 +68,8 @@ def main():
 | 
				
			|||||||
                    ex_force_auth_url=auth_url,
 | 
					                    ex_force_auth_url=auth_url,
 | 
				
			||||||
                    ex_force_auth_version='3.x_password',
 | 
					                    ex_force_auth_version='3.x_password',
 | 
				
			||||||
                    ex_tenant_name=project_name,
 | 
					                    ex_tenant_name=project_name,
 | 
				
			||||||
                    ex_force_service_region=region_name,
 | 
					                    ex_force_service_region=region_name)
 | 
				
			||||||
                    ex_domain_name=domain_name)
 | 
					    #               ex_domain_name=domain_name)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ###########################################################################
 | 
					    ###########################################################################
 | 
				
			||||||
    #
 | 
					    #
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user