From d42fd85614c080e330c7ad5eb522c7239876ea2f Mon Sep 17 00:00:00 2001
From: Christian Schnidrig <christian.schnidrig@switch.ch>
Date: Thu, 23 Aug 2018 10:43:34 +0200
Subject: [PATCH 1/2] fix domain/project name: don't use id use name!

---
 exporter/osclient.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exporter/osclient.py b/exporter/osclient.py
index c99ff35..41e5c96 100644
--- a/exporter/osclient.py
+++ b/exporter/osclient.py
@@ -81,7 +81,7 @@ def get_token(self):
                     "password": {
                         "user": {
                             "name": self.username,
-                            "domain": {"id": self.user_domain},
+                            "domain": {"name": self.user_domain},
                             "password": self.password
                         }
                     }
@@ -89,7 +89,7 @@ def get_token(self):
                 "scope": {
                     "project": {
                         "name": self.tenant_name,
-                        "domain": {"id": self.user_domain}
+                        "domain": {"name": self.user_domain}
                     }
                 }
             }

From c0bb481077013923fdbd2364fc3eb9c29a2c6020 Mon Sep 17 00:00:00 2001
From: Christian Schnidrig <christian.schnidrig@switch.ch>
Date: Tue, 4 Sep 2018 18:39:52 +0200
Subject: [PATCH 2/2] fix: use project domain name instead of user domain for
 projects

---
 exporter/main.py     | 4 ++++
 exporter/osclient.py | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/exporter/main.py b/exporter/main.py
index 5199085..8c8af8a 100755
--- a/exporter/main.py
+++ b/exporter/main.py
@@ -106,6 +106,9 @@ def handler(*args, **kwargs):
     os_user_domain = config.get(
         'OS_USER_DOMAIN_NAME',
         os.getenv('OS_USER_DOMAIN_NAME'))
+    os_project_domain = config.get(
+        'OS_PROJECT_DOMAIN_NAME',
+        os.getenv('OS_PROJECT_DOMAIN_NAME'))
     os_region = config.get('OS_REGION_NAME', os.getenv('OS_REGION_NAME'))
     os_timeout = config.get(
         'TIMEOUT_SECONDS', int(
@@ -131,6 +134,7 @@ def handler(*args, **kwargs):
         os_tenant_name,
         os_username,
         os_user_domain,
+        os_project_domain,
         os_region,
         os_timeout,
         os_retries)
diff --git a/exporter/osclient.py b/exporter/osclient.py
index 41e5c96..cf38d90 100644
--- a/exporter/osclient.py
+++ b/exporter/osclient.py
@@ -44,6 +44,7 @@ def __init__(
             tenant_name,
             username,
             user_domain,
+            project_domain,
             region,
             timeout,
             retries):
@@ -52,6 +53,7 @@ def __init__(
         self.tenant_name = tenant_name
         self.username = username
         self.user_domain = user_domain
+        self.project_domain = project_domain
         self.region = region
         self.timeout = timeout
         self.retries = retries
@@ -89,7 +91,7 @@ def get_token(self):
                 "scope": {
                     "project": {
                         "name": self.tenant_name,
-                        "domain": {"name": self.user_domain}
+                        "domain": {"name": self.project_domain}
                     }
                 }
             }