openstack/puppet-heat
Code Issues Proposed changes

Deprecate support for [ec2authtoken] auth_uri

Browse Source 
The parameter was deprecated in favor of the new keystoneauth options
in the [ec2authtoken] section.

Change-Id: Ic4e8ec0e0cd8d4254c061e141090cb8ff0bedc24
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-11-22 23:31:20 +09:00
parent 67e5f5d531
commit caf22939e4
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/init.pp
View File

@@ -179,10 +179,6 @@
# message, which failed to be delivered due to a recoverable error.
# Defaults to $facts['os_service_default'].
#
# [*keystone_ec2_uri*]
# (optional) Authentication Endpoint URI for ec2 service.
# Defaults to facts['os_service_default']
#
# [*flavor*]
# (optional) Specifies the Authentication method.
# Set to 'standalone' to get Heat to work with a remote OpenStack
@@ -240,9 +236,12 @@
# (Optional) Enable the stack-abandon feature.
# Defaults to undef.
#
# [*keystone_ec2_uri*]
# (optional) Authentication Endpoint URI for ec2 service.
# Defaults to undef.
#
class heat (
Stdlib::Ensure::Package $package_ensure = 'present',
$keystone_ec2_uri = $facts['os_service_default'],
$default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'],
@@ -291,11 +290,16 @@ class heat (
# DEPRECATED PARAMETERS
$enable_stack_adopt = undef,
$enable_stack_abandon = undef,
$keystone_ec2_uri = undef,
) {
include heat::db
include heat::deps
include heat::params
if $keystone_ec2_uri != undef {
warning('The keystone_ec2_uri parameter is deprecated.')
}
if $auth_strategy == 'keystone' {
include heat::keystone::authtoken
}
@@ -344,7 +348,7 @@ class heat (
'DEFAULT/region_name_for_services': value => $region_name;
'DEFAULT/region_name_for_shared_services': value => $region_name_for_shared_services;
'DEFAULT/shared_services_types': value => join(any2array($shared_services_types), ',');
'ec2authtoken/auth_uri': value => $keystone_ec2_uri;
'ec2authtoken/auth_uri': value => pick($keystone_ec2_uri, $facts['os_service_default']);
'paste_deploy/flavor': value => $flavor;
'yaql/limit_iterators': value => $yaql_limit_iterators;
'yaql/memory_quota': value => $yaql_memory_quota;

5
releasenotes/notes/deprecate-keystone_ec2_uri-15d81fc0d693e602.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
deprecations:
- |
The ``heat::keystone_ec2_uri`` parameter has been deprecated. Use
the ``heat::keystone::ec2authtoken`` class instead.