diff --git a/manifests/api.pp b/manifests/api.pp index 6fd6001b..df41a663 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -106,29 +106,28 @@ # Defaults to $facts['os_service_default'] # class cinder::api ( - $service_workers = $facts['os_workers'], - $package_ensure = 'present', - $bind_host = $facts['os_service_default'], - Boolean $enabled = true, - Boolean $manage_service = true, - $ratelimits = $facts['os_service_default'], - $default_volume_type = $facts['os_service_default'], - $ratelimits_factory = - 'cinder.api.v2.limits:RateLimitingMiddleware.factory', - Boolean $sync_db = true, - $public_endpoint = $facts['os_service_default'], - $osapi_volume_base_url = $facts['os_service_default'], - $osapi_max_limit = $facts['os_service_default'], - $service_name = $cinder::params::api_service, - $enable_proxy_headers_parsing = $facts['os_service_default'], - $max_request_body_size = $facts['os_service_default'], - Boolean $use_ssl = false, - $cert_file = $facts['os_service_default'], - $key_file = $facts['os_service_default'], - $ca_file = $facts['os_service_default'], - $auth_strategy = 'keystone', - $osapi_volume_listen_port = $facts['os_service_default'], - $use_forwarded_for = $facts['os_service_default'], + $service_workers = $facts['os_workers'], + Stdlib::Ensure::Package $package_ensure = 'present', + $bind_host = $facts['os_service_default'], + Boolean $enabled = true, + Boolean $manage_service = true, + $ratelimits = $facts['os_service_default'], + $default_volume_type = $facts['os_service_default'], + $ratelimits_factory = 'cinder.api.v2.limits:RateLimitingMiddleware.factory', + Boolean $sync_db = true, + $public_endpoint = $facts['os_service_default'], + $osapi_volume_base_url = $facts['os_service_default'], + $osapi_max_limit = $facts['os_service_default'], + $service_name = $cinder::params::api_service, + $enable_proxy_headers_parsing = $facts['os_service_default'], + $max_request_body_size = $facts['os_service_default'], + Boolean $use_ssl = false, + $cert_file = $facts['os_service_default'], + $key_file = $facts['os_service_default'], + $ca_file = $facts['os_service_default'], + $auth_strategy = 'keystone', + $osapi_volume_listen_port = $facts['os_service_default'], + $use_forwarded_for = $facts['os_service_default'], ) inherits cinder::params { include cinder::deps include cinder::params diff --git a/manifests/backend/emc_vnx.pp b/manifests/backend/emc_vnx.pp index 873386d4..ee59ac11 100644 --- a/manifests/backend/emc_vnx.pp +++ b/manifests/backend/emc_vnx.pp @@ -58,10 +58,6 @@ # (optional) Default max number of LUNs in a storage group. # Defaults to: '256' # -# [*package_ensure*] -# (optional) The state of the package -# Defaults to: 'present' -# # [*extra_options*] # (optional) Hash of extra options to pass to the backend stanza # Defaults to: {} @@ -126,6 +122,10 @@ # (optional) Naviseccli Path. # Defaults to $facts['os_service_default'] # +# [*package_ensure*] +# (optional) The state of the package +# Defaults to: 'present' +# # [*manage_volume_type*] # (Optional) Whether or not manage Cinder Volume type. # If set to true, a Cinder Volume type will be created @@ -136,32 +136,32 @@ define cinder::backend::emc_vnx ( $san_ip, $san_password, $storage_vnx_pool_names, - $default_timeout = '10', - $max_luns_per_storage_group = '256', - $package_ensure = 'present', - $san_login = 'admin', - $volume_backend_name = $name, - $backend_availability_zone = $facts['os_service_default'], - $image_volume_cache_enabled = $facts['os_service_default'], - $image_volume_cache_max_size_gb = $facts['os_service_default'], - $image_volume_cache_max_count = $facts['os_service_default'], - $reserved_percentage = $facts['os_service_default'], - $max_over_subscription_ratio = $facts['os_service_default'], - Hash $extra_options = {}, - $volume_driver = 'cinder.volume.drivers.dell_emc.vnx.driver.VNXDriver', - $storage_protocol = 'iscsi', - $destroy_empty_storage_group = $facts['os_service_default'], - $iscsi_initiators = $facts['os_service_default'], - $io_port_list = $facts['os_service_default'], - $initiator_auto_registration = $facts['os_service_default'], - $initiator_auto_deregistration = $facts['os_service_default'], - $force_delete_lun_in_storagegroup = $facts['os_service_default'], - $ignore_pool_full_threshold = $facts['os_service_default'], - $vnx_async_migrate = $facts['os_service_default'], - $storage_vnx_auth_type = $facts['os_service_default'], - $storage_vnx_security_file_dir = $facts['os_service_default'], - $naviseccli_path = $facts['os_service_default'], - Boolean $manage_volume_type = false, + $default_timeout = '10', + $max_luns_per_storage_group = '256', + $san_login = 'admin', + $volume_backend_name = $name, + $backend_availability_zone = $facts['os_service_default'], + $image_volume_cache_enabled = $facts['os_service_default'], + $image_volume_cache_max_size_gb = $facts['os_service_default'], + $image_volume_cache_max_count = $facts['os_service_default'], + $reserved_percentage = $facts['os_service_default'], + $max_over_subscription_ratio = $facts['os_service_default'], + Hash $extra_options = {}, + $volume_driver = 'cinder.volume.drivers.dell_emc.vnx.driver.VNXDriver', + $storage_protocol = 'iscsi', + $destroy_empty_storage_group = $facts['os_service_default'], + $iscsi_initiators = $facts['os_service_default'], + $io_port_list = $facts['os_service_default'], + $initiator_auto_registration = $facts['os_service_default'], + $initiator_auto_deregistration = $facts['os_service_default'], + $force_delete_lun_in_storagegroup = $facts['os_service_default'], + $ignore_pool_full_threshold = $facts['os_service_default'], + $vnx_async_migrate = $facts['os_service_default'], + $storage_vnx_auth_type = $facts['os_service_default'], + $storage_vnx_security_file_dir = $facts['os_service_default'], + $naviseccli_path = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $manage_volume_type = false, ) { include cinder::deps diff --git a/manifests/backend/nfs.pp b/manifests/backend/nfs.pp index 57697298..b065d782 100644 --- a/manifests/backend/nfs.pp +++ b/manifests/backend/nfs.pp @@ -100,7 +100,8 @@ # Defaults to $facts['os_service_default'] # # [*package_ensure*] -# (optional) Ensure state for package. Defaults to 'present'. +# (optional) Ensure state for package. +# Defaults to 'present'. # # [*extra_options*] # (optional) Hash of extra options to pass to the backend stanza @@ -127,7 +128,7 @@ define cinder::backend::nfs ( $nas_secure_file_permissions = $facts['os_service_default'], $nfs_snapshot_support = $facts['os_service_default'], $nfs_qcow2_volumes = $facts['os_service_default'], - $package_ensure = 'present', + Stdlib::Ensure::Package $package_ensure = 'present', Boolean $manage_volume_type = false, Hash $extra_options = {}, ) { diff --git a/manifests/backup.pp b/manifests/backup.pp index 4775c18b..ec339694 100644 --- a/manifests/backup.pp +++ b/manifests/backup.pp @@ -58,14 +58,14 @@ # under the License. # class cinder::backup ( - Boolean $enabled = true, - Boolean $manage_service = true, - $package_ensure = 'present', - $backup_manager = $facts['os_service_default'], - $backup_api_class = $facts['os_service_default'], - $backup_name_template = $facts['os_service_default'], - $backup_workers = $facts['os_service_default'], - $backup_max_operations = $facts['os_service_default'], + Boolean $enabled = true, + Boolean $manage_service = true, + Stdlib::Ensure::Package $package_ensure = 'present', + $backup_manager = $facts['os_service_default'], + $backup_api_class = $facts['os_service_default'], + $backup_name_template = $facts['os_service_default'], + $backup_workers = $facts['os_service_default'], + $backup_max_operations = $facts['os_service_default'], ) { include cinder::deps include cinder::params diff --git a/manifests/backup/nfs.pp b/manifests/backup/nfs.pp index 08972dc8..1527fc7f 100644 --- a/manifests/backup/nfs.pp +++ b/manifests/backup/nfs.pp @@ -48,7 +48,8 @@ # Defaults to $facts['os_service_default'] # # [*package_ensure*] -# (optional) Ensure state for package. Defaults to 'present'. +# (optional) Ensure state for package. +# Defaults to 'present'. # # === Author(s) # @@ -73,15 +74,15 @@ # class cinder::backup::nfs ( String[1] $backup_share, - $backup_driver = 'cinder.backup.drivers.nfs.NFSBackupDriver', - $backup_file_size = $facts['os_service_default'], - $backup_sha_block_size_bytes = $facts['os_service_default'], - $backup_enable_progress_timer = $facts['os_service_default'], - $backup_mount_point_base = $facts['os_service_default'], - $backup_mount_options = $facts['os_service_default'], - $backup_container = $facts['os_service_default'], - $backup_compression_algorithm = $facts['os_service_default'], - $package_ensure = 'present', + $backup_driver = 'cinder.backup.drivers.nfs.NFSBackupDriver', + $backup_file_size = $facts['os_service_default'], + $backup_sha_block_size_bytes = $facts['os_service_default'], + $backup_enable_progress_timer = $facts['os_service_default'], + $backup_mount_point_base = $facts['os_service_default'], + $backup_mount_options = $facts['os_service_default'], + $backup_container = $facts['os_service_default'], + $backup_compression_algorithm = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', ) { include cinder::deps include cinder::params diff --git a/manifests/client.pp b/manifests/client.pp index 8326a856..d0c52de9 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -9,7 +9,7 @@ # Defaults to 'present'. # class cinder::client ( - $package_ensure = 'present' + Stdlib::Ensure::Package $package_ensure = 'present', ) { include cinder::deps include cinder::params diff --git a/manifests/init.pp b/manifests/init.pp index 1212113f..35b3bb9a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -245,56 +245,56 @@ # Defaults to $facts['os_service_default']. # class cinder ( - $default_transport_url = $facts['os_service_default'], - $rpc_response_timeout = $facts['os_service_default'], - $control_exchange = $facts['os_service_default'], - $executor_thread_pool_size = $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_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_quorum_queue = $facts['os_service_default'], - $rabbit_transient_queues_ttl = $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'], - $rabbit_use_ssl = $facts['os_service_default'], - $service_down_time = $facts['os_service_default'], - $report_interval = $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'], - $kombu_compression = $facts['os_service_default'], - $amqp_durable_queues = $facts['os_service_default'], - $amqp_auto_delete = $facts['os_service_default'], - $package_ensure = 'present', - $api_paste_config = '/etc/cinder/api-paste.ini', - $storage_availability_zone = $facts['os_service_default'], - $default_availability_zone = $facts['os_service_default'], - $allow_availability_zone_fallback = $facts['os_service_default'], - $lock_path = $cinder::params::lock_path, - $image_conversion_dir = $facts['os_service_default'], - $image_compress_on_upload = $facts['os_service_default'], - $image_conversion_cpu_limit = $facts['os_service_default'], - $image_conversion_address_space_limit = $facts['os_service_default'], - $image_conversion_disable = $facts['os_service_default'], - $host = $facts['os_service_default'], - $enable_new_services = $facts['os_service_default'], - Boolean $purge_config = false, - $enable_force_upload = $facts['os_service_default'], - $cinder_internal_tenant_project_id = $facts['os_service_default'], - $cinder_internal_tenant_user_id = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + $default_transport_url = $facts['os_service_default'], + $rpc_response_timeout = $facts['os_service_default'], + $control_exchange = $facts['os_service_default'], + $executor_thread_pool_size = $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_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_quorum_queue = $facts['os_service_default'], + $rabbit_transient_queues_ttl = $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'], + $rabbit_use_ssl = $facts['os_service_default'], + $service_down_time = $facts['os_service_default'], + $report_interval = $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'], + $kombu_compression = $facts['os_service_default'], + $amqp_durable_queues = $facts['os_service_default'], + $amqp_auto_delete = $facts['os_service_default'], + $api_paste_config = '/etc/cinder/api-paste.ini', + $storage_availability_zone = $facts['os_service_default'], + $default_availability_zone = $facts['os_service_default'], + $allow_availability_zone_fallback = $facts['os_service_default'], + $lock_path = $cinder::params::lock_path, + $image_conversion_dir = $facts['os_service_default'], + $image_compress_on_upload = $facts['os_service_default'], + $image_conversion_cpu_limit = $facts['os_service_default'], + $image_conversion_address_space_limit = $facts['os_service_default'], + $image_conversion_disable = $facts['os_service_default'], + $host = $facts['os_service_default'], + $enable_new_services = $facts['os_service_default'], + Boolean $purge_config = false, + $enable_force_upload = $facts['os_service_default'], + $cinder_internal_tenant_project_id = $facts['os_service_default'], + $cinder_internal_tenant_user_id = $facts['os_service_default'], ) inherits cinder::params { include cinder::deps include cinder::db diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp index 0c4561a6..ae36ca0e 100644 --- a/manifests/scheduler.pp +++ b/manifests/scheduler.pp @@ -40,15 +40,15 @@ # Defaults to undef # class cinder::scheduler ( - $driver = $facts['os_service_default'], - $driver_init_wait_time = $facts['os_service_default'], - $host_manager = $facts['os_service_default'], - $max_attempts = $facts['os_service_default'], - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, + $driver = $facts['os_service_default'], + $driver_init_wait_time = $facts['os_service_default'], + $host_manager = $facts['os_service_default'], + $max_attempts = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, # DEPRECATED PARAMETERS - $scheduler_driver = undef + $scheduler_driver = undef ) { include cinder::deps include cinder::params diff --git a/manifests/volume.pp b/manifests/volume.pp index 8127394c..8a1fd46f 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -58,18 +58,18 @@ # Defaults to $facts['os_service_default']. # class cinder::volume ( - $package_ensure = 'present', - Boolean $enabled = true, - Boolean $manage_service = true, - $cluster = $facts['os_service_default'], - $volume_clear = $facts['os_service_default'], - $volume_clear_size = $facts['os_service_default'], - $volume_clear_ionice = $facts['os_service_default'], - $migration_create_volume_timeout_secs = $facts['os_service_default'], - $volume_service_inithost_offload = $facts['os_service_default'], - $reinit_driver_count = $facts['os_service_default'], - $init_host_max_objects_retrieval = $facts['os_service_default'], - $backend_stats_polling_interval = $facts['os_service_default'], + Stdlib::Ensure::Package $package_ensure = 'present', + Boolean $enabled = true, + Boolean $manage_service = true, + $cluster = $facts['os_service_default'], + $volume_clear = $facts['os_service_default'], + $volume_clear_size = $facts['os_service_default'], + $volume_clear_ionice = $facts['os_service_default'], + $migration_create_volume_timeout_secs = $facts['os_service_default'], + $volume_service_inithost_offload = $facts['os_service_default'], + $reinit_driver_count = $facts['os_service_default'], + $init_host_max_objects_retrieval = $facts['os_service_default'], + $backend_stats_polling_interval = $facts['os_service_default'], ) { include cinder::deps include cinder::params