From 8d560b3ff55257370be0b9bc9b5dea73ee82d0ca Mon Sep 17 00:00:00 2001 From: Jadon Naas Date: Thu, 22 Jun 2023 12:40:04 -0400 Subject: [PATCH] Drop the path from the auth_url. The template previously could use v2.0 depending on the value of api_version. This was causing issues in newer releases of OpenStack where the value of api_version was reporting as something other than "3", and the generated Ironic config tried to use the v2.0 Keystone API. This patch removes the optional logic in the template for v2.0 and rely on the global default just like templates/parts/section-placement does. Closes-Bug: #1995778 Change-Id: I8e0270b933f9c8fb5d6a65f9ebb930a0b21fead8 --- templates/parts/section-ironic | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/templates/parts/section-ironic b/templates/parts/section-ironic index 012f1837..c37cc205 100644 --- a/templates/parts/section-ironic +++ b/templates/parts/section-ironic @@ -1,12 +1,7 @@ {% if virt_type == 'ironic' and auth_host and ironic_api_ready -%} -{% if api_version and api_version == "3" -%} -{% set auth_ver = "v3" -%} -{% else -%} -{% set auth_ver = "v2.0" -%} -{% endif -%} [ironic] +auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }} auth_type = password -auth_url = {{auth_protocol}}://{{auth_host}}:{{auth_port}}/{{auth_ver}} project_name = {{ admin_tenant_name }} username = {{ admin_user }} password = {{ admin_password }}