Fix automation

.automation.conf/config.sh

@@ -8,8 +8,7 @@
 # Higher values run tests faster but risk running out of resources and failing tests
 # On production systems, Tempest concurrency can usually be set to a high number e.g. 16-64. It is often limited by the number of available floating IPs.
 # On virtualised test environments, compute and networking speeds often limit the concurrency to 1-16 before tests begin to fail due to timeouts.
-export TEMPEST_CONCURRENCY=2
-
+export TEMPEST_CONCURRENCY=1
 
 # Specify single test whilst experimenting
 #export TEMPEST_PATTERN="${TEMPEST_PATTERN:-tempest.api.compute.servers.test_create_server.ServersTestJSON.test_host_name_is_same_as_server_name}"
@@ -20,9 +19,6 @@ KAYOBE_AUTOMATION_TEMPEST_CONF_OVERRIDES="${KAYOBE_AUTOMATION_CONFIG_PATH}/tempe
 # run as non-admin.
 export RALLY_CONF_ENABLE_CREATE_TEMPEST_RESOURCES=false
 
-# Use the wallaby version of tempest
-export KAYOBE_AUTOMATION_RALLY_TAG="v1.1.0"
-
 if [ ! -z ${KAYOBE_ENVIRONMENT:+x} ]; then
   KAYOBE_AUTOMATION_TEMPEST_CONF_OVERRIDES="${KAYOBE_AUTOMATION_CONFIG_PATH}/tempest/tempest-${KAYOBE_ENVIRONMENT}-${KAYOBE_AUTOMATION_TEMPEST_LOADLIST:-}.overrides.conf"
 

.automation.conf/tempest/accounts/staging.yml

@@ -3,9 +3,7 @@
   # NOTE: We should only need two members but for some reason tempest is
   # requesting an extra user without any roles. This consumes the first
   # tempest user.
-  tenant_name: 'tempest1'
-  types:
-    - load-balancer_member
+  project_name: 'tempest1'
   roles:
     - member
     - reader
@@ -13,9 +11,7 @@
   password: '{{ secrets_tempest_user_password }}'
 
 - username: 'tempest2'
-  tenant_name: 'tempest2'
-  types:
-    - load-balancer_member
+  project_name: 'tempest2'
   roles:
     - member
     - reader
@@ -23,9 +19,7 @@
   password: '{{ secrets_tempest_user_password }}'
 
 - username: 'tempest3'
-  tenant_name: 'tempest3'
-  types:
-    - load-balancer_member
+  project_name: 'tempest3'
   roles:
     - member
     - reader
@@ -36,22 +30,16 @@
   # NOTE: This user does not really have the load-balancer_admin role. We don't
   # actaully need that for any tests we plan to run, but the class setup
   # assumes such a user is available.
-  tenant_name: 'tempest4'
-  types:
-    - load-balancer_admin
+  project_name: 'tempest4'
   roles:
-    - member
     - reader
-    - load-balancer_admin
   password: '{{ secrets_tempest_user_password }}'
 
 - username: 'tempest5'
   # NOTE: This user does not really have the admin role. We don't actaully need
   # that for any tests we plan to run, but the class setup assumes such a user
   # is available.
-  tenant_name: 'tempest5'
-  types:
-    - admin
+  project_name: 'tempest5'
   roles:
     - admin
   password: '{{ secrets_tempest_user_password }}'