openstack/puppet-trove
Code Issues Proposed changes

Validate ensure parameter for package resources

Browse Source 
The minimum version of puppetlabs-stdlib has been bumped globally, so
now we can use the common type definition.

Change-Id: I3e6190db5a4a0a2d8d5bc41492dd96896e8e43d1
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-23 18:03:48 +09:00
parent ee200bc19d
commit 128da25ee2
9 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/api.pp
View File

@@ -110,7 +110,7 @@
class trove::api ( class trove::api (
Boolean $manage_service = true, Boolean $manage_service = true,
$service_name = $trove::params::api_service_name, $service_name = $trove::params::api_service_name,
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = present,
$bind_host = $facts['os_service_default'], $bind_host = $facts['os_service_default'],
$bind_port = $facts['os_service_default'], $bind_port = $facts['os_service_default'],
$backlog = $facts['os_service_default'], $backlog = $facts['os_service_default'],

2
manifests/client.pp
View File

@@ -32,7 +32,7 @@
# #
class trove::client ( class trove::client (
$client_package_name = $trove::params::client_package_name, $client_package_name = $trove::params::client_package_name,
$package_ensure = present, Stdlib::Ensure::Package $package_ensure = present,
) inherits trove::params { ) inherits trove::params {
include trove::deps include trove::deps

2
manifests/conductor.pp
View File

@@ -35,7 +35,7 @@
class trove::conductor ( class trove::conductor (
Boolean $enabled = true, Boolean $enabled = true,
Boolean $manage_service = true, Boolean $manage_service = true,
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = present,
$conductor_manager = 'trove.conductor.manager.Manager', $conductor_manager = 'trove.conductor.manager.Manager',
$workers = $facts['os_workers'], $workers = $facts['os_workers'],
$enable_profiler = $facts['os_service_default'], $enable_profiler = $facts['os_service_default'],

2
manifests/generic_service.pp
View File

@@ -52,7 +52,7 @@ define trove::generic_service (
$service_name, $service_name,
Boolean $enabled = false, Boolean $enabled = false,
Boolean $manage_service = true, Boolean $manage_service = true,
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = present,
) { ) {
include trove::deps include trove::deps
include trove::params include trove::params

2
manifests/guestagent.pp
View File

@@ -117,7 +117,7 @@
class trove::guestagent ( class trove::guestagent (
Boolean $enabled = false, Boolean $enabled = false,
Boolean $manage_service = true, Boolean $manage_service = true,
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = present,
$debug = $facts['os_service_default'], $debug = $facts['os_service_default'],
$log_file = '/var/log/trove/trove-guestagent.log', $log_file = '/var/log/trove/trove-guestagent.log',
$log_dir = '/var/log/trove', $log_dir = '/var/log/trove',

2
manifests/init.pp
View File

@@ -302,7 +302,7 @@ class trove (
$trove_volume_support = $facts['os_service_default'], $trove_volume_support = $facts['os_service_default'],
$volume_rootdisk_support = $facts['os_service_default'], $volume_rootdisk_support = $facts['os_service_default'],
$volume_rootdisk_size = $facts['os_service_default'], $volume_rootdisk_size = $facts['os_service_default'],
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = present,
) { ) {
include trove::deps include trove::deps
include trove::params include trove::params

2
manifests/taskmanager.pp
View File

@@ -50,7 +50,7 @@ class trove::taskmanager (
Boolean $enabled = true, Boolean $enabled = true,
Boolean $manage_service = true, Boolean $manage_service = true,
$guest_log_file = '/var/log/trove/trove-guestagent.log', $guest_log_file = '/var/log/trove/trove-guestagent.log',
$package_ensure = 'present', Stdlib::Ensure::Package $package_ensure = present,
$guestagent_config_file = '/etc/trove/trove-guestagent.conf', $guestagent_config_file = '/etc/trove/trove-guestagent.conf',
$taskmanager_manager = 'trove.taskmanager.manager.Manager', $taskmanager_manager = 'trove.taskmanager.manager.Manager',
) inherits trove { ) inherits trove {

2
metadata.json
View File

@@ -11,7 +11,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/openstacklib", "name": "openstack/openstacklib",

4
spec/classes/trove_client_spec.rb
View File

@@ -36,10 +36,10 @@ describe 'trove::client' 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 { is_expected.to contain_package('python-troveclient').with( it { is_expected.to contain_package('python-troveclient').with(
:ensure => false, :ensure => 'latest',
:name => platform_params[:client_package_name], :name => platform_params[:client_package_name],
:tag => ['openstack', 'openstackclient', 'trove-package'] :tag => ['openstack', 'openstackclient', 'trove-package']
)} )}