Use only one of domain id or domain name in openstack

galaxyproject · Jun 11, 2020 · d612c4d · d612c4d
1 parent e6df230
commit d612c4d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/django-cloudlaunch/cloudlaunch/backend_plugins/cloudman2_app.py b/django-cloudlaunch/cloudlaunch/backend_plugins/cloudman2_app.py
@@ -338,8 +338,7 @@ def delete_iam():
     "username=$os_username\n" \
     "password=$os_password\n" \
     "auth-url=$os_auth_url\n" \
-    "domain-id=$os_domain_id\n" \
-    "domain-name=$os_domain_name\n" \
+    "$domain_entry\n" \
     "region=$os_region\n" \
     "tenant-name=$os_tenant_name\n" \
     "[BlockStorage]\n" \
@@ -393,11 +392,15 @@ def _gen_cloud_conf(self, provider_id, cloud_config):
             os_ignore_az = self._os_ignore_az(
                 zone.get('zone_id'),
                 zone.get('region', {}).get('cloudbridge_settings'))
+            if creds.get('os_project_domain_id'):
+                domain_entry = f"domain-id={creds.get('os_project_domain_id')}"
+            else:
+                domain_entry = f"domain-name={creds.get('os_project_domain_name')}"
+
             values = {
                 'os_username': creds.get('os_username'),
                 'os_password': creds.get('os_password'),
-                'os_domain_id': creds.get('os_project_domain_id'),
-                'os_domain_name': creds.get('os_project_domain_name'),
+                'domain_entry': domain_entry,
                 'os_tenant_name': creds.get('os_project_name'),
                 'os_auth_url': zone.get('cloud', {}).get('auth_url'),
                 'os_region': zone.get('region', {}).get('name'),