Merge "Validate ensure parameter for package resources"

This commit is contained in:
Zuul
2025-09-25 17:32:45 +00:00
committed by Gerrit Code Review
6 changed files with 14 additions and 14 deletions

View File

@@ -33,12 +33,12 @@
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
# #
class placement::api ( class placement::api (
Boolean $enabled = true, Boolean $enabled = true,
Boolean $manage_service = true, Boolean $manage_service = true,
$api_service_name = $placement::params::service_name, $api_service_name = $placement::params::service_name,
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = 'present',
Boolean $sync_db = false, Boolean $sync_db = false,
$enable_proxy_headers_parsing = $facts['os_service_default'], $enable_proxy_headers_parsing = $facts['os_service_default'],
) inherits placement::params { ) inherits placement::params {
include placement::deps include placement::deps
include placement::policy include placement::policy

View File

@@ -9,7 +9,7 @@
# Defaults to 'present' # Defaults to 'present'
# #
class placement::client ( class placement::client (
$ensure = 'present' Stdlib::Ensure::Package $ensure = 'present'
) { ) {
include placement::deps include placement::deps
include placement::params include placement::params

View File

@@ -33,9 +33,9 @@
define placement::generic_service ( define placement::generic_service (
$package_name, $package_name,
$service_name, $service_name,
Boolean $enabled = true, Boolean $enabled = true,
Boolean $manage_service = true, Boolean $manage_service = true,
$ensure_package = 'present' Stdlib::Ensure::Package $ensure_package = 'present'
) { ) {
include placement::deps include placement::deps
include placement::params include placement::params

View File

@@ -32,7 +32,7 @@
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
class placement ( class placement (
$ensure_package = 'present', Stdlib::Ensure::Package $ensure_package = 'present',
Boolean $sync_db = true, Boolean $sync_db = true,
$state_path = $facts['os_service_default'], $state_path = $facts['os_service_default'],
$randomize_allocation_candidates = $facts['os_service_default'], $randomize_allocation_candidates = $facts['os_service_default'],

View File

@@ -7,7 +7,7 @@
}, },
{ {
"name": "puppetlabs/stdlib", "name": "puppetlabs/stdlib",
"version_requirement": ">=5.0.0 <10.0.0" "version_requirement": ">=9.0.0 <10.0.0"
}, },
{ {
"name": "openstack/keystone", "name": "openstack/keystone",

View File

@@ -25,11 +25,11 @@ describe 'placement::api' do
context 'with package_ensure parameter provided' do context 'with package_ensure parameter provided' do
let :params do let :params do
{ :package_ensure => false } { :package_ensure => 'latest' }
end end
it { should contain_placement__generic_service('api').with( it { should contain_placement__generic_service('api').with(
:ensure_package => false, :ensure_package => 'latest',
) } ) }
end end