Remove sqlite_db option
The sqlite_db parameter has been deprecated for one year. We can remove it. Change-Id: I5fbb62f517d2b3ad983d66f28d9d0a2573c0413b
This commit is contained in:
parent
db6c71454c
commit
d42058d77a
|
@ -100,12 +100,6 @@
|
||||||
# (Optional) Enable the experimental use of thread pooling for all DB API calls (boolean value)
|
# (Optional) Enable the experimental use of thread pooling for all DB API calls (boolean value)
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*sqlite_db*]
|
|
||||||
# (Optional) The file name to use with SQLite.
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
define oslo::db(
|
define oslo::db(
|
||||||
$sqlite_synchronous = $::os_service_default,
|
$sqlite_synchronous = $::os_service_default,
|
||||||
$backend = $::os_service_default,
|
$backend = $::os_service_default,
|
||||||
|
@ -129,8 +123,6 @@ define oslo::db(
|
||||||
$db_max_retry_interval = $::os_service_default,
|
$db_max_retry_interval = $::os_service_default,
|
||||||
$db_max_retries = $::os_service_default,
|
$db_max_retries = $::os_service_default,
|
||||||
$use_tpool = $::os_service_default,
|
$use_tpool = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$sqlite_db = undef,
|
|
||||||
){
|
){
|
||||||
|
|
||||||
include ::oslo::params
|
include ::oslo::params
|
||||||
|
@ -176,12 +168,6 @@ define oslo::db(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if $sqlite_db {
|
|
||||||
warning("The sqlite_db parameter is now deprecated and will be removed in the \
|
|
||||||
future release. Please use configuration option connection or slave_connection \
|
|
||||||
to connect to the database.")
|
|
||||||
}
|
|
||||||
|
|
||||||
$database_options = {
|
$database_options = {
|
||||||
'database/sqlite_synchronous' => { value => $sqlite_synchronous },
|
'database/sqlite_synchronous' => { value => $sqlite_synchronous },
|
||||||
'database/backend' => { value => $backend },
|
'database/backend' => { value => $backend },
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- Deprecated sqlite_db option has been removed.
|
Loading…
Reference in New Issue