Validate ensure parameter for package resources
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:
@@ -110,7 +110,7 @@
|
||||
class trove::api (
|
||||
Boolean $manage_service = true,
|
||||
$service_name = $trove::params::api_service_name,
|
||||
$package_ensure = 'present',
|
||||
Stdlib::Ensure::Package $package_ensure = present,
|
||||
$bind_host = $facts['os_service_default'],
|
||||
$bind_port = $facts['os_service_default'],
|
||||
$backlog = $facts['os_service_default'],
|
||||
|
@@ -32,7 +32,7 @@
|
||||
#
|
||||
class trove::client (
|
||||
$client_package_name = $trove::params::client_package_name,
|
||||
$package_ensure = present,
|
||||
Stdlib::Ensure::Package $package_ensure = present,
|
||||
) inherits trove::params {
|
||||
include trove::deps
|
||||
|
||||
|
@@ -35,7 +35,7 @@
|
||||
class trove::conductor (
|
||||
Boolean $enabled = true,
|
||||
Boolean $manage_service = true,
|
||||
$package_ensure = 'present',
|
||||
Stdlib::Ensure::Package $package_ensure = present,
|
||||
$conductor_manager = 'trove.conductor.manager.Manager',
|
||||
$workers = $facts['os_workers'],
|
||||
$enable_profiler = $facts['os_service_default'],
|
||||
|
@@ -52,7 +52,7 @@ define trove::generic_service (
|
||||
$service_name,
|
||||
Boolean $enabled = false,
|
||||
Boolean $manage_service = true,
|
||||
$package_ensure = 'present',
|
||||
Stdlib::Ensure::Package $package_ensure = present,
|
||||
) {
|
||||
include trove::deps
|
||||
include trove::params
|
||||
|
@@ -117,7 +117,7 @@
|
||||
class trove::guestagent (
|
||||
Boolean $enabled = false,
|
||||
Boolean $manage_service = true,
|
||||
$package_ensure = 'present',
|
||||
Stdlib::Ensure::Package $package_ensure = present,
|
||||
$debug = $facts['os_service_default'],
|
||||
$log_file = '/var/log/trove/trove-guestagent.log',
|
||||
$log_dir = '/var/log/trove',
|
||||
|
@@ -302,7 +302,7 @@ class trove (
|
||||
$trove_volume_support = $facts['os_service_default'],
|
||||
$volume_rootdisk_support = $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::params
|
||||
|
@@ -50,7 +50,7 @@ class trove::taskmanager (
|
||||
Boolean $enabled = true,
|
||||
Boolean $manage_service = true,
|
||||
$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',
|
||||
$taskmanager_manager = 'trove.taskmanager.manager.Manager',
|
||||
) inherits trove {
|
||||
|
@@ -11,7 +11,7 @@
|
||||
},
|
||||
{
|
||||
"name": "puppetlabs/stdlib",
|
||||
"version_requirement": ">=5.0.0 <10.0.0"
|
||||
"version_requirement": ">=9.0.0 <10.0.0"
|
||||
},
|
||||
{
|
||||
"name": "openstack/openstacklib",
|
||||
|
@@ -36,10 +36,10 @@ describe 'trove::client' do
|
||||
|
||||
context 'with package_ensure parameter provided' do
|
||||
let :params do
|
||||
{ :package_ensure => false }
|
||||
{ :package_ensure => 'latest' }
|
||||
end
|
||||
it { is_expected.to contain_package('python-troveclient').with(
|
||||
:ensure => false,
|
||||
:ensure => 'latest',
|
||||
:name => platform_params[:client_package_name],
|
||||
:tag => ['openstack', 'openstackclient', 'trove-package']
|
||||
)}
|
||||
|
Reference in New Issue
Block a user