Inspector: Clean up deprecated database parameters
... because these were deprecated before Wallaby release. Change-Id: I3220c93fd780119bb852a15a3f556f55aeba7677
This commit is contained in:
parent
f27dd22cbd
commit
9bb6803655
|
@ -190,12 +190,6 @@
|
|||
# driver.
|
||||
# Defaults to 'snponly.efi'
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*db_connection*]
|
||||
# (optional) Location of the ironic-inspector node cache database
|
||||
# Defaults to undef
|
||||
#
|
||||
class ironic::inspector (
|
||||
$package_ensure = 'present',
|
||||
$enabled = true,
|
||||
|
@ -232,8 +226,6 @@ class ironic::inspector (
|
|||
$default_transport_url = 'fake://',
|
||||
$port_physnet_cidr_map = {},
|
||||
$uefi_ipxe_bootfile_name = 'snponly.efi',
|
||||
# DEPRECATED PARAMETERS
|
||||
$db_connection = undef,
|
||||
) {
|
||||
|
||||
validate_legacy(Array, 'validate_array', $dnsmasq_ip_subnets)
|
||||
|
@ -245,11 +237,6 @@ class ironic::inspector (
|
|||
include ironic::inspector::db
|
||||
include ironic::inspector::policy
|
||||
|
||||
if $db_connection != undef {
|
||||
warning('The db_connection parameter is deprecated and will be removed \
|
||||
in a future realse. Use ironic::inspector::db::database_connection instead')
|
||||
}
|
||||
|
||||
if $auth_strategy == 'keystone' {
|
||||
include ironic::inspector::authtoken
|
||||
}
|
||||
|
|
|
@ -43,12 +43,6 @@
|
|||
# Cluster (NDB).
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*database_min_pool_size*]
|
||||
# Minimum number of SQL connections to keep open in a pool.
|
||||
# (Optional) Defaults to undef
|
||||
#
|
||||
class ironic::inspector::db (
|
||||
$database_connection = 'sqlite:////var/lib/ironic-inspector/inspector.sqlite',
|
||||
$database_connection_recycle_time = $::os_service_default,
|
||||
|
@ -59,20 +53,12 @@ class ironic::inspector::db (
|
|||
$database_max_overflow = $::os_service_default,
|
||||
$database_pool_timeout = $::os_service_default,
|
||||
$mysql_enable_ndb = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$database_min_pool_size = undef,
|
||||
) {
|
||||
|
||||
include ironic::params
|
||||
|
||||
if $database_min_pool_size {
|
||||
warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
|
||||
}
|
||||
|
||||
$database_connection_real = pick($::ironic::inspector::db_connection, $database_connection)
|
||||
|
||||
oslo::db { 'ironic_inspector_config':
|
||||
connection => $database_connection_real,
|
||||
connection => $database_connection,
|
||||
connection_recycle_time => $database_connection_recycle_time,
|
||||
max_pool_size => $database_max_pool_size,
|
||||
max_retries => $database_max_retries,
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``ironic::inspector::db_connection`` parameter has been removed.
|
||||
|
||||
- |
|
||||
The ``ironic::inspector::db::database_min_pool_size`` parameter has been
|
||||
removed.
|
Loading…
Reference in New Issue