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

40
manifests/api.pp
View File

@@ -108,26 +108,26 @@
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
# #
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'],
$workers = $facts['os_workers'], $workers = $facts['os_workers'],
Boolean $enabled = true, Boolean $enabled = true,
Boolean $purge_config = false, Boolean $purge_config = false,
Boolean $sync_db = true, Boolean $sync_db = true,
$cert_file = $facts['os_service_default'], $cert_file = $facts['os_service_default'],
$key_file = $facts['os_service_default'], $key_file = $facts['os_service_default'],
$ca_file = $facts['os_service_default'], $ca_file = $facts['os_service_default'],
$http_get_rate = $facts['os_service_default'], $http_get_rate = $facts['os_service_default'],
$http_post_rate = $facts['os_service_default'], $http_post_rate = $facts['os_service_default'],
$http_put_rate = $facts['os_service_default'], $http_put_rate = $facts['os_service_default'],
$http_delete_rate = $facts['os_service_default'], $http_delete_rate = $facts['os_service_default'],
$http_mgmt_post_rate = $facts['os_service_default'], $http_mgmt_post_rate = $facts['os_service_default'],
$auth_strategy = 'keystone', $auth_strategy = 'keystone',
$taskmanager_queue = $facts['os_service_default'], $taskmanager_queue = $facts['os_service_default'],
) inherits trove::params { ) inherits trove::params {
include trove::deps include trove::deps
include trove::db include trove::db

4
manifests/client.pp
View File

@@ -31,8 +31,8 @@
# #
# #
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

14
manifests/conductor.pp
View File

@@ -33,13 +33,13 @@
# Default: $facts['os_service_default'] # Default: $facts['os_service_default']
# #
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'],
$trace_sqlalchemy = $facts['os_service_default'], $trace_sqlalchemy = $facts['os_service_default'],
) { ) {
include trove::deps include trove::deps
include trove::params include trove::params

6
manifests/generic_service.pp
View File

@@ -50,9 +50,9 @@
define trove::generic_service ( define trove::generic_service (
$package_name, $package_name,
$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

50
manifests/guestagent.pp
View File

@@ -115,32 +115,32 @@
# Defaults to undef # Defaults to undef
# #
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',
$use_syslog = $facts['os_service_default'], $use_syslog = $facts['os_service_default'],
$log_facility = $facts['os_service_default'], $log_facility = $facts['os_service_default'],
$swift_url = $facts['os_service_default'], $swift_url = $facts['os_service_default'],
$swift_service_type = $facts['os_service_default'], $swift_service_type = $facts['os_service_default'],
$swift_endpoint_type = $facts['os_service_default'], $swift_endpoint_type = $facts['os_service_default'],
$default_transport_url = $trove::default_transport_url, $default_transport_url = $trove::default_transport_url,
$rabbit_use_ssl = $trove::rabbit_use_ssl, $rabbit_use_ssl = $trove::rabbit_use_ssl,
$root_grant = $facts['os_service_default'], $root_grant = $facts['os_service_default'],
$root_grant_option = $facts['os_service_default'], $root_grant_option = $facts['os_service_default'],
$container_registry = $facts['os_service_default'], $container_registry = $facts['os_service_default'],
$container_registry_username = $facts['os_service_default'], $container_registry_username = $facts['os_service_default'],
$container_registry_password = $facts['os_service_default'], $container_registry_password = $facts['os_service_default'],
$num_tries = $facts['os_service_default'], $num_tries = $facts['os_service_default'],
$volume_fstype = $facts['os_service_default'], $volume_fstype = $facts['os_service_default'],
$format_options = $facts['os_service_default'], $format_options = $facts['os_service_default'],
$volume_format_timeout = $facts['os_service_default'], $volume_format_timeout = $facts['os_service_default'],
$mount_options = $facts['os_service_default'], $mount_options = $facts['os_service_default'],
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$default_password_length = undef, $default_password_length = undef,
$backup_aes_cbc_key = undef, $backup_aes_cbc_key = undef,
) inherits trove { ) inherits trove {
include trove::deps include trove::deps
include trove::params include trove::params

102
manifests/init.pp
View File

@@ -252,57 +252,57 @@
# Defaults to 'present' # Defaults to 'present'
# #
class trove ( class trove (
$default_transport_url = $facts['os_service_default'], $default_transport_url = $facts['os_service_default'],
$notification_transport_url = $facts['os_service_default'], $notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'], $notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'], $notification_topics = $facts['os_service_default'],
$notification_retry = $facts['os_service_default'], $notification_retry = $facts['os_service_default'],
$rabbit_use_ssl = $facts['os_service_default'], $rabbit_use_ssl = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'], $rabbit_ha_queues = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
$rabbit_heartbeat_rate = $facts['os_service_default'], $rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_qos_prefetch_count = $facts['os_service_default'], $rabbit_qos_prefetch_count = $facts['os_service_default'],
$rabbit_quorum_queue = $facts['os_service_default'], $rabbit_quorum_queue = $facts['os_service_default'],
$rabbit_transient_queues_ttl = $facts['os_service_default'], $rabbit_transient_queues_ttl = $facts['os_service_default'],
$rabbit_transient_quorum_queue = $facts['os_service_default'], $rabbit_transient_quorum_queue = $facts['os_service_default'],
$rabbit_quorum_delivery_limit = $facts['os_service_default'], $rabbit_quorum_delivery_limit = $facts['os_service_default'],
$rabbit_quorum_max_memory_length = $facts['os_service_default'], $rabbit_quorum_max_memory_length = $facts['os_service_default'],
$rabbit_quorum_max_memory_bytes = $facts['os_service_default'], $rabbit_quorum_max_memory_bytes = $facts['os_service_default'],
$rabbit_use_queue_manager = $facts['os_service_default'], $rabbit_use_queue_manager = $facts['os_service_default'],
$rabbit_stream_fanout = $facts['os_service_default'], $rabbit_stream_fanout = $facts['os_service_default'],
$rabbit_enable_cancel_on_failover = $facts['os_service_default'], $rabbit_enable_cancel_on_failover = $facts['os_service_default'],
$kombu_ssl_ca_certs = $facts['os_service_default'], $kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $facts['os_service_default'], $kombu_ssl_certfile = $facts['os_service_default'],
$kombu_ssl_keyfile = $facts['os_service_default'], $kombu_ssl_keyfile = $facts['os_service_default'],
$kombu_ssl_version = $facts['os_service_default'], $kombu_ssl_version = $facts['os_service_default'],
$kombu_reconnect_delay = $facts['os_service_default'], $kombu_reconnect_delay = $facts['os_service_default'],
$kombu_failover_strategy = $facts['os_service_default'], $kombu_failover_strategy = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'], $amqp_durable_queues = $facts['os_service_default'],
$amqp_auto_delete = $facts['os_service_default'], $amqp_auto_delete = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'], $rpc_response_timeout = $facts['os_service_default'],
$control_exchange = 'trove', $control_exchange = 'trove',
$nova_compute_url = $facts['os_service_default'], $nova_compute_url = $facts['os_service_default'],
$cinder_url = $facts['os_service_default'], $cinder_url = $facts['os_service_default'],
$swift_url = $facts['os_service_default'], $swift_url = $facts['os_service_default'],
$neutron_url = $facts['os_service_default'], $neutron_url = $facts['os_service_default'],
$glance_url = $facts['os_service_default'], $glance_url = $facts['os_service_default'],
$nova_compute_service_type = $facts['os_service_default'], $nova_compute_service_type = $facts['os_service_default'],
$cinder_service_type = $facts['os_service_default'], $cinder_service_type = $facts['os_service_default'],
$swift_service_type = $facts['os_service_default'], $swift_service_type = $facts['os_service_default'],
$neutron_service_type = $facts['os_service_default'], $neutron_service_type = $facts['os_service_default'],
$glance_service_type = $facts['os_service_default'], $glance_service_type = $facts['os_service_default'],
$nova_compute_endpoint_type = $facts['os_service_default'], $nova_compute_endpoint_type = $facts['os_service_default'],
$cinder_endpoint_type = $facts['os_service_default'], $cinder_endpoint_type = $facts['os_service_default'],
$swift_endpoint_type = $facts['os_service_default'], $swift_endpoint_type = $facts['os_service_default'],
$glance_endpoint_type = $facts['os_service_default'], $glance_endpoint_type = $facts['os_service_default'],
$trove_endpoint_type = $facts['os_service_default'], $trove_endpoint_type = $facts['os_service_default'],
$neutron_endpoint_type = $facts['os_service_default'], $neutron_endpoint_type = $facts['os_service_default'],
$management_networks = $facts['os_service_default'], $management_networks = $facts['os_service_default'],
$network_isolation = $facts['os_service_default'], $network_isolation = $facts['os_service_default'],
$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

12
manifests/taskmanager.pp
View File

@@ -47,12 +47,12 @@
# Defaults to 'trove.taskmanager.manager.Manager'. # Defaults to 'trove.taskmanager.manager.Manager'.
# #
class trove::taskmanager ( 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 {
include trove::deps include trove::deps
include trove::params include trove::params

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']
)} )}