From d0dd31ee35e2cdea81ef1d3fa77ec83cad97ff0a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: 2023年7月28日 13:10:57 +0900 Subject: [PATCH] db: Use ensure_packages to manage backend package ... instead of skipping the resource definition in case the same is already defined. This allows us to detect any conflicting definitions defined in multiple manifests. Change-Id: Id78c6c1553973b57b4b9e7edaf8d029d833f4722 --- manifests/db.pp | 6 +++--- spec/defines/oslo_db_spec.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/db.pp b/manifests/db.pp index 6114ce6..7261e8f 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -161,12 +161,12 @@ define oslo::db( default: {} } - if $backend_package and !defined(Package[$backend_package]) { - package { $backend_package: + if $backend_package { + ensure_packages($backend_package, { ensure => $backend_package_ensure, name => $backend_package, tag => 'openstack', - } + }) } } diff --git a/spec/defines/oslo_db_spec.rb b/spec/defines/oslo_db_spec.rb index e796f63..6e1a656 100644 --- a/spec/defines/oslo_db_spec.rb +++ b/spec/defines/oslo_db_spec.rb @@ -150,7 +150,7 @@ describe 'oslo::db' do it 'install the proper backend package' do is_expected.to contain_package(platform_params[:pymysql_package_name]).with( - :ensure => 'present', + :ensure => 'installed', :name => platform_params[:pymysql_package_name], :tag => 'openstack' ) @@ -176,7 +176,7 @@ describe 'oslo::db' do it 'install the proper backend package' do is_expected.to contain_package(platform_params[:pysqlite2_package_name]).with( - :ensure => 'present', + :ensure => 'installed', :name => platform_params[:pysqlite2_package_name], :tag => 'openstack' )

AltStyle によって変換されたページ (->オリジナル) /