diff --git a/keystone/values.yaml b/keystone/values.yaml
index a8b0f7b2da..cbc94976c4 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -124,8 +124,8 @@ dependencies:
           service: oslo_db
     rabbit_init:
       services:
-      - service: oslo_messaging
-        endpoint: internal
+        - service: oslo_messaging
+          endpoint: internal
     domain_manage:
       services:
         - endpoint: internal
@@ -559,185 +559,185 @@ conf:
     run_tempest: false
     tests:
       KeystoneBasic.add_and_remove_user_role:
-      - runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.authenticate_user_and_validate_token:
-      - args: {}
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args: {}
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_add_and_list_user_roles:
-      - runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_and_delete_ec2credential:
-      - runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_and_delete_role:
-      - runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_and_delete_service:
-      - args:
-          description: test_description
-          service_type: Rally_test_type
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args:
+            description: test_description
+            service_type: Rally_test_type
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_and_get_role:
-      - args: {}
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args: {}
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_and_list_ec2credentials:
-      - runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_and_list_services:
-      - args:
-          description: test_description
-          service_type: Rally_test_type
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args:
+            description: test_description
+            service_type: Rally_test_type
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_and_list_tenants:
-      - args: {}
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args: {}
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_and_list_users:
-      - args: {}
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args: {}
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_delete_user:
-      - args: {}
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args: {}
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_tenant:
-      - args: {}
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args: {}
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_tenant_with_users:
-      - args:
-          users_per_tenant: 1
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args:
+            users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_update_and_delete_tenant:
-      - args: {}
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args: {}
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_user:
-      - args: {}
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args: {}
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_user_set_enabled_and_delete:
-      - args:
-          enabled: true
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
-      - args:
-          enabled: false
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args:
+            enabled: true
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+        - args:
+            enabled: false
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.create_user_update_password:
-      - args: {}
-        runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - args: {}
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
       KeystoneBasic.get_entities:
-      - runner:
-          concurrency: 1
-          times: 1
-          type: constant
-        sla:
-          failure_rate:
-            max: 0
+        - runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
   mpm_event:
     override:
     append: