Merge ~xavpaice/charm-openstack-service-checks/+git/charm-openstack-service-checks:keystonev3 into ~canonical-bootstack/charm-openstack-service-checks:master

[Xav Paice]

[James Hebden (ec0)]

As discussed my only concern was the scoping the token to a domain and/or project may produce different results to the existing v2 code, which may have required additional logic to have the checks operate across multiple projects and domains.

Given this can be configured (and has been tested as such) to use the admin domain/project and this behaviour is not seen, LGTM.

[James Hebden (ec0)]

review: Approve

diff --git a/reactive/service_checks.py b/reactive/service_checks.py
index 4fbf5bf..50d745e 100644
--- a/reactive/service_checks.py
+++ b/reactive/service_checks.py
@@ -57,25 +57,34 @@ def save_creds(keystone):
 
 def get_creds(keystone):
 
-    if keystone.api_version() == 2:
-        api_url = "v2.0"
-    elif keystone.api_version() == 3:
+    if keystone.api_version() == '3':
         api_url = "v3"
+        try:
+            domain = keystone.domain()
+        except AttributeError:
+            domain = 'service_domain'
+        creds = {
+            'credentials_username': keystone.credentials_username(),
+            'credentials_password': keystone.credentials_password(),
+            'credentials_project': keystone.credentials_project(),
+            'auth_version': '3',
+            'region': keystone.region(),
+            'credentials_user_domain': domain,
+            'credentials_project_domain': domain
+            }
     else:
         api_url = "v2.0"
+        creds = {
+            'credentials_username': keystone.credentials_username(),
+            'credentials_password': keystone.credentials_password(),
+            'credentials_project': keystone.credentials_project(),
+            'region': keystone.region(),
+            }
 
     auth_url = "%s://%s:%s/%s" % (keystone.auth_protocol(),
                                   keystone.auth_host(), keystone.auth_port(),
                                   api_url)
-
-    creds = {
-         'credentials_username': keystone.credentials_username(),
-         'credentials_password': keystone.credentials_password(),
-         'credentials_project': keystone.credentials_project(),
-         'region': keystone.region(),
-         'auth_url': auth_url,
-    }
-
+    creds['auth_url'] = auth_url
     return creds
 
 
@@ -84,14 +93,25 @@ def get_creds(keystone):
 def get_credentials():
     keystone_creds = config_flags_parser(config.get('os-credentials'))
     if keystone_creds:
-        creds = {
-            'credentials_username': keystone_creds['username'],
-            'credentials_password': keystone_creds['password'],
-            'credentials_project': keystone_creds['credentials_project'],
-            'region': keystone_creds['region_name'],
-            'auth_url': keystone_creds['auth_url'],
-        }
-
+        if '/v3' in keystone_creds['auth_url']:
+            creds = {
+                'credentials_username': keystone_creds['username'],
+                'credentials_password': keystone_creds['password'],
+                'credentials_project': keystone_creds['credentials_project'],
+                'region': keystone_creds['region_name'],
+                'auth_url': keystone_creds['auth_url'],
+                'auth_version': '3',
+                'credentials_user_domain': keystone_creds['domain'],
+                'credentials_project_domain': keystone_creds['domain'],
+            }
+        else:
+            creds = {
+                'credentials_username': keystone_creds['username'],
+                'credentials_password': keystone_creds['password'],
+                'credentials_project': keystone_creds['credentials_project'],
+                'region': keystone_creds['region_name'],
+                'auth_url': keystone_creds['auth_url'],
+            }
     else:
         kv = unitdata.kv()
         creds = kv.get('keystone-relation-creds')
diff --git a/templates/nagios.novarc b/templates/nagios.novarc
index 982f914..e4c7e68 100644
--- a/templates/nagios.novarc
+++ b/templates/nagios.novarc
@@ -1,5 +1,6 @@
 export OS_USERNAME={{ credentials_username }}
 export OS_TENANT_NAME={{ credentials_project }}
+export OS_PROJECT_NAME={{ credentials_project }}
 export OS_PASSWORD={{ credentials_password }}
 export OS_REGION_NAME={{ region }}
 export OS_AUTH_URL={{ auth_url }}
@@ -9,4 +10,9 @@ export REQUESTS_CA_BUNDLE=$OS_CACERT
 {%- endif %}
 # Allow novaclient libs to save to ~/.novaclient
 export HOME=${SNAP_COMMON}
-
+{%- if auth_version %}
+export OS_IDENTITY_API_VERSION={{ auth_version }}
+export OS_AUTH_VERSION={{ auth_version }}
+export OS_USER_DOMAIN_NAME={{ credentials_user_domain }}
+export OS_PROJECT_DOMAIN_NAME={{ credentials_project_domain }}
+{%- endif %}