openstack/puppet-heat
Code Issues Proposed changes

Remove heat_clients_keystone_uri option

Browse Source 
The heat_clients_keystone_uri parameter has been deprecated for one year.
We can remove it.

Change-Id: I507fd2beecface5f8de35d18bfb546a653c6ef51
This commit is contained in:
ZhongShengping 2019-09-20 09:34:27 +08:00
parent e96248bca3
commit 4c35662238
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/init.pp
View File

@ -281,12 +281,6 @@
# take for evaluation. # take for evaluation.
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
## DEPRECATED PARAMS
#
# [*heat_clients_keystone_uri*]
# (optional) Heat clients auth url in format like http://127.0.0.1:5000/.
# Defaults to undef.
#
class heat( class heat(
$package_ensure = 'present', $package_ensure = 'present',
$keystone_ec2_uri = $::os_service_default, $keystone_ec2_uri = $::os_service_default,
@ -348,18 +342,12 @@ class heat(
$auth_strategy = 'keystone', $auth_strategy = 'keystone',
$yaql_memory_quota = $::os_service_default, $yaql_memory_quota = $::os_service_default,
$yaql_limit_iterators = $::os_service_default, $yaql_limit_iterators = $::os_service_default,
## DEPRECATED PARAMS
$heat_clients_keystone_uri = undef,
) { ) {
include ::heat::db include ::heat::db
include ::heat::deps include ::heat::deps
include ::heat::params include ::heat::params
if $heat_clients_keystone_uri {
warning('heat_clients_keystone_ur is deprecated, has no effect and will be removed in the future')
}
if $auth_strategy == 'keystone' { if $auth_strategy == 'keystone' {
include ::heat::keystone::authtoken include ::heat::keystone::authtoken
} }

3
releasenotes/notes/remove_deprecated_heat_clients_keystone_uri-90814e13549fd532.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- Deprecated heat_clients_keystone_uri option has been removed.