Merge pull request #199 from gvlproject/add_project_domain_id

Added support for openstack project domain id
galaxyproject · Jun 10, 2020 · 6c92735 · 6c92735
2 parents bc7f4b4 + e6df230
commit 6c92735
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/django-cloudlaunch/cloudlaunch/backend_plugins/cloudman2_app.py b/django-cloudlaunch/cloudlaunch/backend_plugins/cloudman2_app.py
@@ -338,7 +338,8 @@ def delete_iam():
     "username=$os_username\n" \
     "password=$os_password\n" \
     "auth-url=$os_auth_url\n" \
-    "domain-name=$os_domain\n" \
+    "domain-id=$os_domain_id\n" \
+    "domain-name=$os_domain_name\n" \
     "region=$os_region\n" \
     "tenant-name=$os_tenant_name\n" \
     "[BlockStorage]\n" \
@@ -395,7 +396,8 @@ def _gen_cloud_conf(self, provider_id, cloud_config):
             values = {
                 'os_username': creds.get('os_username'),
                 'os_password': creds.get('os_password'),
-                'os_domain': creds.get('os_project_domain_name'),
+                'os_domain_id': creds.get('os_project_domain_id'),
+                'os_domain_name': creds.get('os_project_domain_name'),
                 'os_tenant_name': creds.get('os_project_name'),
                 'os_auth_url': zone.get('cloud', {}).get('auth_url'),
                 'os_region': zone.get('region', {}).get('name'),

diff --git a/django-cloudlaunch/cloudlaunchserver/settings.py b/django-cloudlaunch/cloudlaunchserver/settings.py
@@ -47,6 +47,7 @@
     'cl-os-password',
     'cl-os-tenant-name',
     'cl-os-project-name',
+    'cl-os-project-domain-id',
     'cl-os-project-domain-name',
     'cl-os-user-domain-name',
     'cl-os-identity-api-version',