diff --git a/manifests/api.pp b/manifests/api.pp index ae815d8a..7d999fea 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -108,26 +108,26 @@ # Defaults to $facts['os_service_default']. # class trove::api ( - Boolean $manage_service = true, - $service_name = $trove::params::api_service_name, - $package_ensure = 'present', - $bind_host = $facts['os_service_default'], - $bind_port = $facts['os_service_default'], - $backlog = $facts['os_service_default'], - $workers = $facts['os_workers'], - Boolean $enabled = true, - Boolean $purge_config = false, - Boolean $sync_db = true, - $cert_file = $facts['os_service_default'], - $key_file = $facts['os_service_default'], - $ca_file = $facts['os_service_default'], - $http_get_rate = $facts['os_service_default'], - $http_post_rate = $facts['os_service_default'], - $http_put_rate = $facts['os_service_default'], - $http_delete_rate = $facts['os_service_default'], - $http_mgmt_post_rate = $facts['os_service_default'], - $auth_strategy = 'keystone', - $taskmanager_queue = $facts['os_service_default'], + Boolean $manage_service = true, + $service_name = $trove::params::api_service_name, + Stdlib::Ensure::Package $package_ensure = present, + $bind_host = $facts['os_service_default'], + $bind_port = $facts['os_service_default'], + $backlog = $facts['os_service_default'], + $workers = $facts['os_workers'], + Boolean $enabled = true, + Boolean $purge_config = false, + Boolean $sync_db = true, + $cert_file = $facts['os_service_default'], + $key_file = $facts['os_service_default'], + $ca_file = $facts['os_service_default'], + $http_get_rate = $facts['os_service_default'], + $http_post_rate = $facts['os_service_default'], + $http_put_rate = $facts['os_service_default'], + $http_delete_rate = $facts['os_service_default'], + $http_mgmt_post_rate = $facts['os_service_default'], + $auth_strategy = 'keystone', + $taskmanager_queue = $facts['os_service_default'], ) inherits trove::params { include trove::deps include trove::db diff --git a/manifests/client.pp b/manifests/client.pp index 9d4e4ca4..9dc995f1 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -31,8 +31,8 @@ # # class trove::client ( - $client_package_name = $trove::params::client_package_name, - $package_ensure = present, + $client_package_name = $trove::params::client_package_name, + Stdlib::Ensure::Package $package_ensure = present, ) inherits trove::params { include trove::deps diff --git a/manifests/conductor.pp b/manifests/conductor.pp index cdb1e008..85df8c86 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -33,13 +33,13 @@ # Default: $facts['os_service_default'] # class trove::conductor ( - Boolean $enabled = true, - Boolean $manage_service = true, - $package_ensure = 'present', - $conductor_manager = 'trove.conductor.manager.Manager', - $workers = $facts['os_workers'], - $enable_profiler = $facts['os_service_default'], - $trace_sqlalchemy = $facts['os_service_default'], + Boolean $enabled = true, + Boolean $manage_service = true, + Stdlib::Ensure::Package $package_ensure = present, + $conductor_manager = 'trove.conductor.manager.Manager', + $workers = $facts['os_workers'], + $enable_profiler = $facts['os_service_default'], + $trace_sqlalchemy = $facts['os_service_default'], ) { include trove::deps include trove::params diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp index d6927a5d..ff732010 100644 --- a/manifests/generic_service.pp +++ b/manifests/generic_service.pp @@ -50,9 +50,9 @@ define trove::generic_service ( $package_name, $service_name, - Boolean $enabled = false, - Boolean $manage_service = true, - $package_ensure = 'present', + Boolean $enabled = false, + Boolean $manage_service = true, + Stdlib::Ensure::Package $package_ensure = present, ) { include trove::deps include trove::params diff --git a/manifests/guestagent.pp b/manifests/guestagent.pp index 545899e4..b0432264 100644 --- a/manifests/guestagent.pp +++ b/manifests/guestagent.pp @@ -115,32 +115,32 @@ # Defaults to undef # class trove::guestagent ( - Boolean $enabled = false, - Boolean $manage_service = true, - $package_ensure = 'present', - $debug = $facts['os_service_default'], - $log_file = '/var/log/trove/trove-guestagent.log', - $log_dir = '/var/log/trove', - $use_syslog = $facts['os_service_default'], - $log_facility = $facts['os_service_default'], - $swift_url = $facts['os_service_default'], - $swift_service_type = $facts['os_service_default'], - $swift_endpoint_type = $facts['os_service_default'], - $default_transport_url = $trove::default_transport_url, - $rabbit_use_ssl = $trove::rabbit_use_ssl, - $root_grant = $facts['os_service_default'], - $root_grant_option = $facts['os_service_default'], - $container_registry = $facts['os_service_default'], - $container_registry_username = $facts['os_service_default'], - $container_registry_password = $facts['os_service_default'], - $num_tries = $facts['os_service_default'], - $volume_fstype = $facts['os_service_default'], - $format_options = $facts['os_service_default'], - $volume_format_timeout = $facts['os_service_default'], - $mount_options = $facts['os_service_default'], + Boolean $enabled = false, + Boolean $manage_service = true, + Stdlib::Ensure::Package $package_ensure = present, + $debug = $facts['os_service_default'], + $log_file = '/var/log/trove/trove-guestagent.log', + $log_dir = '/var/log/trove', + $use_syslog = $facts['os_service_default'], + $log_facility = $facts['os_service_default'], + $swift_url = $facts['os_service_default'], + $swift_service_type = $facts['os_service_default'], + $swift_endpoint_type = $facts['os_service_default'], + $default_transport_url = $trove::default_transport_url, + $rabbit_use_ssl = $trove::rabbit_use_ssl, + $root_grant = $facts['os_service_default'], + $root_grant_option = $facts['os_service_default'], + $container_registry = $facts['os_service_default'], + $container_registry_username = $facts['os_service_default'], + $container_registry_password = $facts['os_service_default'], + $num_tries = $facts['os_service_default'], + $volume_fstype = $facts['os_service_default'], + $format_options = $facts['os_service_default'], + $volume_format_timeout = $facts['os_service_default'], + $mount_options = $facts['os_service_default'], # DEPRECATED PARAMETERS - $default_password_length = undef, - $backup_aes_cbc_key = undef, + $default_password_length = undef, + $backup_aes_cbc_key = undef, ) inherits trove { include trove::deps include trove::params diff --git a/manifests/init.pp b/manifests/init.pp index db0e01cd..f98073c4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -252,57 +252,57 @@ # Defaults to 'present' # class trove ( - $default_transport_url = $facts['os_service_default'], - $notification_transport_url = $facts['os_service_default'], - $notification_driver = $facts['os_service_default'], - $notification_topics = $facts['os_service_default'], - $notification_retry = $facts['os_service_default'], - $rabbit_use_ssl = $facts['os_service_default'], - $rabbit_ha_queues = $facts['os_service_default'], - $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], - $rabbit_heartbeat_rate = $facts['os_service_default'], - $rabbit_qos_prefetch_count = $facts['os_service_default'], - $rabbit_quorum_queue = $facts['os_service_default'], - $rabbit_transient_queues_ttl = $facts['os_service_default'], - $rabbit_transient_quorum_queue = $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_bytes = $facts['os_service_default'], - $rabbit_use_queue_manager = $facts['os_service_default'], - $rabbit_stream_fanout = $facts['os_service_default'], - $rabbit_enable_cancel_on_failover = $facts['os_service_default'], - $kombu_ssl_ca_certs = $facts['os_service_default'], - $kombu_ssl_certfile = $facts['os_service_default'], - $kombu_ssl_keyfile = $facts['os_service_default'], - $kombu_ssl_version = $facts['os_service_default'], - $kombu_reconnect_delay = $facts['os_service_default'], - $kombu_failover_strategy = $facts['os_service_default'], - $amqp_durable_queues = $facts['os_service_default'], - $amqp_auto_delete = $facts['os_service_default'], - $rpc_response_timeout = $facts['os_service_default'], - $control_exchange = 'trove', - $nova_compute_url = $facts['os_service_default'], - $cinder_url = $facts['os_service_default'], - $swift_url = $facts['os_service_default'], - $neutron_url = $facts['os_service_default'], - $glance_url = $facts['os_service_default'], - $nova_compute_service_type = $facts['os_service_default'], - $cinder_service_type = $facts['os_service_default'], - $swift_service_type = $facts['os_service_default'], - $neutron_service_type = $facts['os_service_default'], - $glance_service_type = $facts['os_service_default'], - $nova_compute_endpoint_type = $facts['os_service_default'], - $cinder_endpoint_type = $facts['os_service_default'], - $swift_endpoint_type = $facts['os_service_default'], - $glance_endpoint_type = $facts['os_service_default'], - $trove_endpoint_type = $facts['os_service_default'], - $neutron_endpoint_type = $facts['os_service_default'], - $management_networks = $facts['os_service_default'], - $network_isolation = $facts['os_service_default'], - $trove_volume_support = $facts['os_service_default'], - $volume_rootdisk_support = $facts['os_service_default'], - $volume_rootdisk_size = $facts['os_service_default'], - $package_ensure = 'present', + $default_transport_url = $facts['os_service_default'], + $notification_transport_url = $facts['os_service_default'], + $notification_driver = $facts['os_service_default'], + $notification_topics = $facts['os_service_default'], + $notification_retry = $facts['os_service_default'], + $rabbit_use_ssl = $facts['os_service_default'], + $rabbit_ha_queues = $facts['os_service_default'], + $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'], + $rabbit_heartbeat_rate = $facts['os_service_default'], + $rabbit_qos_prefetch_count = $facts['os_service_default'], + $rabbit_quorum_queue = $facts['os_service_default'], + $rabbit_transient_queues_ttl = $facts['os_service_default'], + $rabbit_transient_quorum_queue = $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_bytes = $facts['os_service_default'], + $rabbit_use_queue_manager = $facts['os_service_default'], + $rabbit_stream_fanout = $facts['os_service_default'], + $rabbit_enable_cancel_on_failover = $facts['os_service_default'], + $kombu_ssl_ca_certs = $facts['os_service_default'], + $kombu_ssl_certfile = $facts['os_service_default'], + $kombu_ssl_keyfile = $facts['os_service_default'], + $kombu_ssl_version = $facts['os_service_default'], + $kombu_reconnect_delay = $facts['os_service_default'], + $kombu_failover_strategy = $facts['os_service_default'], + $amqp_durable_queues = $facts['os_service_default'], + $amqp_auto_delete = $facts['os_service_default'], + $rpc_response_timeout = $facts['os_service_default'], + $control_exchange = 'trove', + $nova_compute_url = $facts['os_service_default'], + $cinder_url = $facts['os_service_default'], + $swift_url = $facts['os_service_default'], + $neutron_url = $facts['os_service_default'], + $glance_url = $facts['os_service_default'], + $nova_compute_service_type = $facts['os_service_default'], + $cinder_service_type = $facts['os_service_default'], + $swift_service_type = $facts['os_service_default'], + $neutron_service_type = $facts['os_service_default'], + $glance_service_type = $facts['os_service_default'], + $nova_compute_endpoint_type = $facts['os_service_default'], + $cinder_endpoint_type = $facts['os_service_default'], + $swift_endpoint_type = $facts['os_service_default'], + $glance_endpoint_type = $facts['os_service_default'], + $trove_endpoint_type = $facts['os_service_default'], + $neutron_endpoint_type = $facts['os_service_default'], + $management_networks = $facts['os_service_default'], + $network_isolation = $facts['os_service_default'], + $trove_volume_support = $facts['os_service_default'], + $volume_rootdisk_support = $facts['os_service_default'], + $volume_rootdisk_size = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = present, ) { include trove::deps include trove::params diff --git a/manifests/taskmanager.pp b/manifests/taskmanager.pp index 3ab1dd84..d00c444f 100644 --- a/manifests/taskmanager.pp +++ b/manifests/taskmanager.pp @@ -47,12 +47,12 @@ # Defaults to 'trove.taskmanager.manager.Manager'. # class trove::taskmanager ( - Boolean $enabled = true, - Boolean $manage_service = true, - $guest_log_file = '/var/log/trove/trove-guestagent.log', - $package_ensure = 'present', - $guestagent_config_file = '/etc/trove/trove-guestagent.conf', - $taskmanager_manager = 'trove.taskmanager.manager.Manager', + Boolean $enabled = true, + Boolean $manage_service = true, + $guest_log_file = '/var/log/trove/trove-guestagent.log', + Stdlib::Ensure::Package $package_ensure = present, + $guestagent_config_file = '/etc/trove/trove-guestagent.conf', + $taskmanager_manager = 'trove.taskmanager.manager.Manager', ) inherits trove { include trove::deps include trove::params diff --git a/metadata.json b/metadata.json index ae53ab1c..146e1c57 100644 --- a/metadata.json +++ b/metadata.json @@ -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", diff --git a/spec/classes/trove_client_spec.rb b/spec/classes/trove_client_spec.rb index eccef442..621bcfbd 100644 --- a/spec/classes/trove_client_spec.rb +++ b/spec/classes/trove_client_spec.rb @@ -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'] )}