Make auth_url detection more robust

azimuth-cloud · Feb 7, 2024 · e0f8789 · e0f8789
1 parent 89bce59
commit e0f8789
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/environments/base/inventory/group_vars/all.yml b/environments/base/inventory/group_vars/all.yml
@@ -148,9 +148,10 @@ __os_auth_url: >-
   {{-
     lookup('file', __os_clouds_file) |
       from_yaml |
-      json_query('clouds.' + __os_cloud + '.auth.auth_url')
+      json_query('clouds.' + __os_cloud + '.auth.auth_url') |
+      trim('/')
   }}
-azimuth_openstack_auth_url: "{{ __os_auth_url | trim('/') }}/v3"
+azimuth_openstack_auth_url: "{{ __os_auth_url.removesuffix("/v3") }}/v3"
 
 # Use the current project ID for the HA CAPI cluster
 capi_cluster_openstack_project_id: >-