Merge ~axino/charm-prometheus-openstack-exporter/+git/prometheus-openstack-exporter-charm:axino into ~prometheus-charmers/charm-prometheus-openstack-exporter/+git/prometheus-openstack-exporter-charm:master

[Junien F]

handle keystone v3 with keystone relation data

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Laurent Sesquès (sajoupa)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 5ccd02bcd8506f90659fd813711a811b64e33916

diff --git a/hooks/relations/keystone-credentials/requires.py b/hooks/relations/keystone-credentials/requires.py
index 4cd17eb..4c5ef74 100644
--- a/hooks/relations/keystone-credentials/requires.py
+++ b/hooks/relations/keystone-credentials/requires.py
@@ -26,7 +26,7 @@ class KeystoneCredentialsRequires(RelationBase):
         'api_version', 'auth_host', 'auth_port', 'auth_protocol',
         'credentials_host', 'credentials_password', 'credentials_port',
         'credentials_project', 'credentials_project_id',
-        'credentials_protocol', 'credentials_username', 'region'
+        'credentials_protocol', 'credentials_username', 'domain', 'region'
     ]
 
     def update_state(self):
@@ -67,7 +67,7 @@ class KeystoneCredentialsRequires(RelationBase):
     def auth_url(self):
         auth_url_format_api_v = {
             "2": "{}://{}:{}/v2.0",
-            "3": "{}://{}:{}/3"
+            "3": "{}://{}:{}/v3"
         }
         version = self.api_version()
         if version:
diff --git a/reactive/openstack_exporter.py b/reactive/openstack_exporter.py
index eeeeacb..8df7c93 100644
--- a/reactive/openstack_exporter.py
+++ b/reactive/openstack_exporter.py
@@ -143,6 +143,16 @@ def get_credentials():
     else:
         kv = unitdata.kv()
         creds = kv.get('keystone-relation-creds')
+        # The "dict" given by the relation and the variables expected by the
+        # template aren't the same, so we need to manually map some values.
+        if 'domain' in creds:
+            if 'credentials_user_domain_name' not in creds:
+                creds['credentials_user_domain_name'] = creds['domain']
+            if 'credentials_project_domain_name' not in creds:
+                creds['credentials_project_domain_name'] = creds['domain']
+        if 'api_version' in creds:
+            if 'identity_api_version' not in creds:
+                creds['credentials_identity_api_version'] = int(creds['api_version'])
     ssl_ca = convert_from_base64(config.get('ssl_ca'))
     if ssl_ca:
         creds['ssl_ca'] = ssl_ca
@@ -220,4 +230,3 @@ def update_nrpe_config(svc):
                          'check_http -I 127.0.0.1 -p {} -u /metrics'.format(port)
                          )
     nrpe_setup.write()
-