openstack
/
puppet-heat
Code Issues Proposed changes

Remove deprecated client parameters 

These parameters were deprecated in favor of the separate classes for
client options[1].

[1] 0d043d793f

Change-Id: I28b7462f2330409b9dee7debba63ce756a0a74b1
This commit is contained in:
Takashi Kajinami 2023-06-23 13:06:30 +09:00
parent 3021cd9daf
commit 43384d02b1
5 changed files with 9 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/clients.pp
View File

@ -35,10 +35,8 @@ class heat::clients (
include heat::deps
$endpoint_type_real = pick($::heat::heat_clients_endpoint_type, $endpoint_type)
heat::clients::base { 'clients':
endpoint_type => $endpoint_type_real,
endpoint_type => $endpoint_type,
ca_file => $ca_file,
cert_file => $cert_file,
key_file => $key_file,

4
manifests/clients/heat.pp
View File

@ -40,8 +40,6 @@ class heat::clients::heat (
include heat::deps
$url_real = pick($::heat::heat_clients_url, $url)
heat::clients::base { 'clients_heat':
endpoint_type => $endpoint_type,
ca_file => $ca_file,
@ -51,6 +49,6 @@ class heat::clients::heat (
}
heat_config {
'clients_heat/url': value => $url_real;
'clients_heat/url': value => $url;
}
}

24
manifests/init.pp
View File

@ -240,17 +240,6 @@
# take for evaluation.
# Defaults to $facts['os_service_default'].
#
# DEPRECATED PARAMETERS
#
# [*heat_clients_url*]
# (optional) Heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s.
# Defaults to undef
#
# [*heat_clients_endpoint_type*]
# (optional) Type of endpoint in Identity service catalog to use for
# communication with the OpenStack service.
# Defaults to undef
#
class heat(
$package_ensure = 'present',
$keystone_ec2_uri = $facts['os_service_default'],
@ -304,9 +293,6 @@ class heat(
$auth_strategy = 'keystone',
$yaql_memory_quota = $facts['os_service_default'],
$yaql_limit_iterators = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$heat_clients_url = undef,
$heat_clients_endpoint_type = undef,
) {
include heat::db
@ -361,16 +347,6 @@ class heat(
password => $amqp_password,
}
if $heat_clients_url != undef {
warning('The heat_clients_url parameter is deprecated. Use the heat::clients::heat class.')
}
include heat::clients::heat
if $heat_clients_endpoint_type!= undef {
warning('The heat_clients_endpoint_type parameter is deprecated. Use the heat::clients class.')
}
include heat::clients
heat_config {
'DEFAULT/host': value => $host;
'DEFAULT/max_template_size': value => $max_template_size;

7
releasenotes/notes/cleanup-client-opts-1e100ddfc6302731.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The following parameters have been removed.
- ``heat::heat_clients_url``
- ``heat::heat_clients_endpoint_type``

21
spec/classes/heat_init_spec.rb
View File

@ -92,10 +92,6 @@ describe 'heat' do
is_expected.to contain_heat_config('DEFAULT/max_json_body_size').with_value('<SERVICE DEFAULT>')
end
it 'configures endpoint_type for clients' do
is_expected.to contain_heat_config('clients/endpoint_type').with_value( '<SERVICE DEFAULT>' )
end
it 'configures keystone_ec2_uri' do
is_expected.to contain_heat_config('ec2authtoken/auth_uri').with_value( '<SERVICE DEFAULT>' )
end
@ -124,11 +120,6 @@ describe 'heat' do
:max_request_body_size => '<SERVICE DEFAULT>',
)
end
it 'sets clients_heat url' do
is_expected.to contain_heat_config('clients_heat/url').with_value('<SERVICE DEFAULT>')
end
end
shared_examples_for 'configures default rabbitmq parameters' do
@ -240,18 +231,6 @@ describe 'heat' do
)}
end
shared_examples_for 'with heat_clients_endpoint_type set' do
before do
params.merge!(
:heat_clients_endpoint_type => 'internal',
)
end
it do
is_expected.to contain_heat_config('clients/endpoint_type').with_value('internal')
end
end
shared_examples_for 'with ec2authtoken auth uri set' do
before do
params.merge!(