From 0ed341f447aaec139fb0c39ff643d8e75f015712 Mon Sep 17 00:00:00 2001 From: Alexey Stupnikov Date: Thu, 15 Apr 2021 14:55:49 +0200 Subject: [PATCH] Remove heat::heat_keystone_clients_url definition During Queens release cycle it was decided that clients_keystone/auth_uri should be defined and should point to public URL to allow instances run some API calls. Two changes were added: - I4429d86d831f49f1bc0fef04379a81ada20b6ab6 was used to add related definitions to puppet-heat - Ib1cb8a5da886e3f7afd88f8dc9d63f0847f677bd was used to add appropriate hiera defition to THT But hiera definition in THT was incorrect: heat::heat_keystone_clients_url was defined instead of heat::heat_clients_keystone_uri. heat_clients_keystone_uri parameter was removed from puppet-heat during Train release cycle: I507fd2beecface5f8de35d18bfb546a653c6ef51 Partial-Bug: #1916386 Change-Id: I2797da50489e3812aa58415e2e6ba44894a89094 (cherry picked from commit dc083686dee210a1b81a32da2ff1f1a0f17ec324) (cherry picked from commit c3f91bcd7608428fa6e65cdf155ebe8f1e8c0cd0) --- deployment/heat/heat-base-puppet.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml index 8b42b0b3d4..dc95e530b4 100644 --- a/deployment/heat/heat-base-puppet.yaml +++ b/deployment/heat/heat-base-puppet.yaml @@ -179,7 +179,6 @@ outputs: heat::keystone::authtoken::password: {get_param: HeatPassword} heat::keystone::authtoken::region_name: {get_param: KeystoneRegion} heat::keystone::authtoken::interface: 'internal' - heat::heat_keystone_clients_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix] } heat::keystone::domain::domain_name: 'heat_stack' heat::keystone::domain::domain_admin: 'heat_stack_domain_admin' heat::keystone::domain::domain_admin_email: 'heat_stack_domain_admin@localhost'