Drop barbican-specific database options

These options were renamed and now barbican uses the consistent options.

Depends-on: https://review.opendev.org/c/openstack/barbican/+/848011
Change-Id: Icd79dafba400b55d023387da3ae704a6186cefa2
This commit is contained in:
Takashi Kajinami 2024-02-10 01:19:56 +09:00
parent f62dcc9bee
commit a67c2c8caa

View File

@ -79,12 +79,12 @@ class barbican::db (
mysql_enable_ndb => $mysql_enable_ndb, mysql_enable_ndb => $mysql_enable_ndb,
} }
# TODO(aschultz): Remove this config once barbican properly leverages oslo # TODO(tkajinam): Remove this after 2024.1 release
barbican_config { barbican_config {
'DEFAULT/sql_connection': value => $database_connection, secret => true; 'DEFAULT/sql_connection': ensure => absent;
'DEFAULT/sql_idle_timeout': value => $database_connection_recycle_time; 'DEFAULT/sql_idle_timeout': ensure => absent;
'DEFAULT/sql_pool_size': value => $database_pool_size; 'DEFAULT/sql_pool_size': ensure => absent;
'DEFAULT/sql_pool_max_overflow': value => $database_max_overflow; 'DEFAULT/sql_pool_max_overflow': ensure => absent;
} }
# all db settings should be applied and all packages should be installed # all db settings should be applied and all packages should be installed