Merge "Add domain info to relation data"

hooks/keystone_utils.py

@@ -2241,6 +2241,8 @@ def add_credentials_to_keystone(relation_id=None, remote_unit=None):
         "api_version": get_api_version(),
         "region": config('region')
     }
+    if domain:
+        relation_data['domain'] = domain
     # Get and pass CA bundle settings
     relation_data.update(get_ssl_ca_settings())
 

unit_tests/test_keystone_utils.py

@@ -1140,6 +1140,7 @@ class TestKeystoneUtils(CharmTestCase):
                          'credentials_project': 'services',
                          'credentials_project_id': 'abcdef0123456789',
                          'region': 'RegionOne',
+                         'domain': 'Non-Default',
                          'api_version': 3}
 
         utils.add_credentials_to_keystone(