Fix typos and define mapping rules for both IRIS IAM and Cambridge-local...

Fix typos and define mapping rules for both IRIS IAM and Cambridge-local Keycloak OIDC user federation

etc/kayobe/environments/staging/kolla/config/keystone/iris_identity-mappings.json

+[
+    {
+        "local": [
+            {
+                "user": {
+                    "name": "{0}",
+                    "email": "{1}"
+                },
+                "group": {
+                    "domain": {
+                    "name": "iris"
+                    },
+                    "name": "iris-cambridge-testing-users"
+                }
+            }
+        ],
+        "remote": [
+            {
+                "type": "OIDC-preferred_username"
+            },
+            {
+                "type": "OIDC-email"
+            },
+            {
+                "regex": true,
+                "type": "OIDC-email",
+                "any_one_of": [
+                    "pfb29@cam.ac.uk"
+                ]
+            }
+        ]
+    }
+] 

etc/kayobe/environments/staging/kolla/globals.yml

@@ -27,9 +27,11 @@ keystone_identity_providers:
     protocol: "openid"
     identifier: "https://iris-iam.stfc.ac.uk/"
     public_name: "Authenticate via IRIS-IAM"
-    attribute_mapping: "keycloak_mapping"
+    attribute_mapping: "iris_mapping"
     metadata_folder: "{{ kayobe_config_path }}/environments/staging/arcus-idp-conf/idp"
 
 keystone_identity_mappings:
   - name: "keycloak_mapping"
-    file: "{% raw %}{{ node_custom_config }}{% endraw %}/keystone/identity-mappings.json"
+    file: "{% raw %}{{ node_custom_config }}{% endraw %}/keystone/keycloak_identity-mappings.json"
+  - name: "iris_mapping"
+    file: "{% raw %}{{ node_custom_config }}{% endraw %}/keystone/iris_identity-mappings.json"