Merge "db: Use ensure_packages to manage backend package"

This commit is contained in:
Zuul 2023-08-02 13:58:29 +00:00 committed by Gerrit Code Review
commit 825b1a00c7
2 changed files with 5 additions and 5 deletions

View File

@ -163,12 +163,12 @@ define oslo::db(
} }
} }
if $backend_package and !defined(Package[$backend_package]) { if $backend_package {
package { $backend_package: ensure_packages($backend_package, {
ensure => $backend_package_ensure, ensure => $backend_package_ensure,
name => $backend_package, name => $backend_package,
tag => 'openstack', tag => 'openstack',
} })
} }
} }

View File

@ -150,7 +150,7 @@ describe 'oslo::db' do
it 'install the proper backend package' do it 'install the proper backend package' do
is_expected.to contain_package(platform_params[:pymysql_package_name]).with( is_expected.to contain_package(platform_params[:pymysql_package_name]).with(
:ensure => 'present', :ensure => 'installed',
:name => platform_params[:pymysql_package_name], :name => platform_params[:pymysql_package_name],
:tag => 'openstack' :tag => 'openstack'
) )
@ -176,7 +176,7 @@ describe 'oslo::db' do
it 'install the proper backend package' do it 'install the proper backend package' do
is_expected.to contain_package(platform_params[:pysqlite2_package_name]).with( is_expected.to contain_package(platform_params[:pysqlite2_package_name]).with(
:ensure => 'present', :ensure => 'installed',
:name => platform_params[:pysqlite2_package_name], :name => platform_params[:pysqlite2_package_name],
:tag => 'openstack' :tag => 'openstack'
) )