fix: use correct tempest values
diff --git a/roles/openstack_helm_endpoints/vars/main.yml b/roles/openstack_helm_endpoints/vars/main.yml
index 3e44e61..a0fa547 100644
--- a/roles/openstack_helm_endpoints/vars/main.yml
+++ b/roles/openstack_helm_endpoints/vars/main.yml
@@ -455,14 +455,6 @@
horizon:
password: "{{ openstack_helm_endpoints_horizon_mariadb_password }}"
-_openstack_helm_endpoints_tempest:
- identity:
- auth:
- tempest:
- region_name: "{{ openstack_helm_endpoints_tempest_region_name }}"
- username: "tempest-{{ openstack_helm_endpoints_tempest_region_name }}"
- password: "{{ openstack_helm_endpoints_tempest_keystone_password }}"
-
_openstack_helm_endpoints_container_infra:
identity:
auth:
diff --git a/roles/tempest/vars/main.yml b/roles/tempest/vars/main.yml
index 7919cff..c8ab79c 100644
--- a/roles/tempest/vars/main.yml
+++ b/roles/tempest/vars/main.yml
@@ -13,7 +13,7 @@
# under the License.
_tempest_helm_values:
- endpoints: "{{ openstack_helm_endpoints }}"
+ endpoints: "{{ openstack_helm_endpoints | combine(_tempest_endpoint_values, recursive=True) }}"
images:
tags: "{{ atmosphere_images | vexxhost.atmosphere.openstack_helm_image_tags('tempest') }}"
jobs:
@@ -51,3 +51,15 @@
reseller_admin_role: admin
pvc:
enabled: false
+
+_tempest_endpoint_values:
+ identity:
+ auth:
+ tempest:
+ region_name: "{{ openstack_helm_endpoints_tempest_region_name }}"
+ username: "tempest-{{ openstack_helm_endpoints_tempest_region_name }}"
+ password: "{{ openstack_helm_endpoints_tempest_keystone_password }}"
+ path:
+ # NOTE(mnaser): Heat uses the catalog and blindly adds a /v3 to the end of
+ # the endpoint. This is a workaround to make it work.
+ default: /v3