Remove support for templated catalog driver
The templated catalog driver was deprecated in keystone during 2024.1
cycle[1] and is being removed.
Support for the driver by this module was deprecated during the same
cycle[2] so can be removed now.
[1] 307296af5e170ca6b0d44fd5ec85a39bd6b5e572
[2] 29a32c74a6
Change-Id: I3c1d4683ffeacee3e137f4ced1852572e964b9bd
This commit is contained in:
@@ -362,12 +362,6 @@
|
|||||||
# (Optional) Whether to use durable queues in AMQP.
|
# (Optional) Whether to use durable queues in AMQP.
|
||||||
# Defaults to $facts['os_service_default'].
|
# Defaults to $facts['os_service_default'].
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*catalog_template_file*]
|
|
||||||
# (Optional) Path to the catalog used if 'templated' catalog driver is used.
|
|
||||||
# Defaults to '/etc/keystone/default_catalog.templates'
|
|
||||||
#
|
|
||||||
# == Authors
|
# == Authors
|
||||||
#
|
#
|
||||||
# Dan Bode dan@puppetlabs.com
|
# Dan Bode dan@puppetlabs.com
|
||||||
@@ -442,21 +436,12 @@ class keystone(
|
|||||||
$max_request_body_size = $facts['os_service_default'],
|
$max_request_body_size = $facts['os_service_default'],
|
||||||
Boolean $purge_config = false,
|
Boolean $purge_config = false,
|
||||||
$amqp_durable_queues = $facts['os_service_default'],
|
$amqp_durable_queues = $facts['os_service_default'],
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$catalog_template_file = undef,
|
|
||||||
) inherits keystone::params {
|
) inherits keystone::params {
|
||||||
|
|
||||||
include keystone::deps
|
include keystone::deps
|
||||||
include keystone::logging
|
include keystone::logging
|
||||||
include keystone::policy
|
include keystone::policy
|
||||||
|
|
||||||
if $catalog_template_file != undef {
|
|
||||||
warning('The catalog_template_file parameter is deprecated and will be removed in a future release')
|
|
||||||
$catalog_template_file_real = $catalog_template_file
|
|
||||||
} else {
|
|
||||||
$catalog_template_file_real = '/etc/keystone/default_catalog.templates'
|
|
||||||
}
|
|
||||||
|
|
||||||
if $manage_policyrcd {
|
if $manage_policyrcd {
|
||||||
# openstacklib policy_rcd only affects debian based systems.
|
# openstacklib policy_rcd only affects debian based systems.
|
||||||
if ($facts['os']['name'] == 'Ubuntu') {
|
if ($facts['os']['name'] == 'Ubuntu') {
|
||||||
@@ -516,8 +501,12 @@ class keystone(
|
|||||||
}
|
}
|
||||||
|
|
||||||
keystone_config {
|
keystone_config {
|
||||||
'catalog/driver': value => $catalog_driver;
|
'catalog/driver': value => $catalog_driver;
|
||||||
'catalog/template_file': value => $catalog_template_file_real;
|
}
|
||||||
|
|
||||||
|
# TODO(tkajinam): Remove this after 2025.1 release
|
||||||
|
keystone_config {
|
||||||
|
'catalog/template_file': ensure => absent;
|
||||||
}
|
}
|
||||||
|
|
||||||
keystone_config {
|
keystone_config {
|
||||||
|
@@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``keystone::catalog_template_file`` parameter has been removed.
|
@@ -47,7 +47,6 @@ describe 'keystone' do
|
|||||||
)
|
)
|
||||||
|
|
||||||
is_expected.to contain_keystone_config('catalog/driver').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_keystone_config('catalog/driver').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_keystone_config('catalog/template_file').with_value('/etc/keystone/default_catalog.templates')
|
|
||||||
is_expected.to contain_keystone_config('DEFAULT/max_token_size').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_keystone_config('DEFAULT/max_token_size').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_keystone_config('DEFAULT/list_limit').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_keystone_config('DEFAULT/list_limit').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('<SERVICE DEFAULT>')
|
||||||
@@ -155,7 +154,6 @@ describe 'keystone' do
|
|||||||
:enable_proxy_headers_parsing => true,
|
:enable_proxy_headers_parsing => true,
|
||||||
:max_request_body_size => 114688,
|
:max_request_body_size => 114688,
|
||||||
:catalog_driver => 'templated',
|
:catalog_driver => 'templated',
|
||||||
:catalog_template_file => '/some/template_file',
|
|
||||||
:max_token_size => 255,
|
:max_token_size => 255,
|
||||||
:list_limit => 10000,
|
:list_limit => 10000,
|
||||||
:notification_format => 'basic',
|
:notification_format => 'basic',
|
||||||
@@ -185,7 +183,6 @@ describe 'keystone' do
|
|||||||
)
|
)
|
||||||
|
|
||||||
is_expected.to contain_keystone_config('catalog/driver').with_value('templated')
|
is_expected.to contain_keystone_config('catalog/driver').with_value('templated')
|
||||||
is_expected.to contain_keystone_config('catalog/template_file').with_value('/some/template_file')
|
|
||||||
is_expected.to contain_keystone_config('DEFAULT/max_token_size').with_value(255)
|
is_expected.to contain_keystone_config('DEFAULT/max_token_size').with_value(255)
|
||||||
is_expected.to contain_keystone_config('DEFAULT/list_limit').with_value(10000)
|
is_expected.to contain_keystone_config('DEFAULT/list_limit').with_value(10000)
|
||||||
is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('basic')
|
is_expected.to contain_keystone_config('DEFAULT/notification_format').with_value('basic')
|
||||||
|
Reference in New Issue
Block a user