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: I5d7f95ba0a70e8fa4bfc9a0214797da6b38c52d7 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
116
manifests/api.pp
116
manifests/api.pp
@@ -273,65 +273,65 @@
|
||||
# Defaults to undef
|
||||
#
|
||||
class glance::api (
|
||||
$package_ensure = 'present',
|
||||
$bind_host = $facts['os_service_default'],
|
||||
$bind_port = $facts['os_service_default'],
|
||||
$backlog = $facts['os_service_default'],
|
||||
$workers = $facts['os_workers'],
|
||||
$auth_strategy = 'keystone',
|
||||
String $paste_deploy_flavor = 'keystone',
|
||||
$paste_deploy_config_file = $facts['os_service_default'],
|
||||
Boolean $manage_service = true,
|
||||
Boolean $enabled = true,
|
||||
$service_name = $glance::params::api_service_name,
|
||||
$show_image_direct_url = $facts['os_service_default'],
|
||||
Boolean $purge_config = false,
|
||||
$enforce_secure_rbac = $facts['os_service_default'],
|
||||
$use_keystone_limits = $facts['os_service_default'],
|
||||
$enabled_backends = undef,
|
||||
$default_backend = undef,
|
||||
$container_formats = $facts['os_service_default'],
|
||||
$disk_formats = $facts['os_service_default'],
|
||||
$require_image_format_match = $facts['os_service_default'],
|
||||
$image_cache_driver = $facts['os_service_default'],
|
||||
$image_cache_dir = '/var/lib/glance/image-cache',
|
||||
$image_cache_max_size = $facts['os_service_default'],
|
||||
$image_cache_stall_time = $facts['os_service_default'],
|
||||
$image_import_plugins = $facts['os_service_default'],
|
||||
$inject_metadata_properties = $facts['os_service_default'],
|
||||
$ignore_user_roles = $facts['os_service_default'],
|
||||
$image_conversion_output_format = $facts['os_service_default'],
|
||||
$enabled_import_methods = $facts['os_service_default'],
|
||||
$node_staging_uri = $facts['os_service_default'],
|
||||
$worker_self_reference_url = $facts['os_service_default'],
|
||||
$image_member_quota = $facts['os_service_default'],
|
||||
$image_property_quota = $facts['os_service_default'],
|
||||
$image_tag_quota = $facts['os_service_default'],
|
||||
$image_location_quota = $facts['os_service_default'],
|
||||
$image_size_cap = $facts['os_service_default'],
|
||||
$user_storage_quota = $facts['os_service_default'],
|
||||
$task_time_to_live = $facts['os_service_default'],
|
||||
$task_executor = $facts['os_service_default'],
|
||||
$task_work_dir = $facts['os_service_default'],
|
||||
$taskflow_engine_mode = $facts['os_service_default'],
|
||||
$taskflow_max_workers = $facts['os_service_default'],
|
||||
$conversion_format = $facts['os_service_default'],
|
||||
$enable_proxy_headers_parsing = $facts['os_service_default'],
|
||||
$max_request_body_size = $facts['os_service_default'],
|
||||
Boolean $sync_db = true,
|
||||
$limit_param_default = $facts['os_service_default'],
|
||||
$api_limit_max = $facts['os_service_default'],
|
||||
$lock_path = $glance::params::lock_path,
|
||||
$public_endpoint = $facts['os_service_default'],
|
||||
$hashing_algorithm = $facts['os_service_default'],
|
||||
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'],
|
||||
$auth_strategy = 'keystone',
|
||||
String $paste_deploy_flavor = 'keystone',
|
||||
$paste_deploy_config_file = $facts['os_service_default'],
|
||||
Boolean $manage_service = true,
|
||||
Boolean $enabled = true,
|
||||
$service_name = $glance::params::api_service_name,
|
||||
$show_image_direct_url = $facts['os_service_default'],
|
||||
Boolean $purge_config = false,
|
||||
$enforce_secure_rbac = $facts['os_service_default'],
|
||||
$use_keystone_limits = $facts['os_service_default'],
|
||||
$enabled_backends = undef,
|
||||
$default_backend = undef,
|
||||
$container_formats = $facts['os_service_default'],
|
||||
$disk_formats = $facts['os_service_default'],
|
||||
$require_image_format_match = $facts['os_service_default'],
|
||||
$image_cache_driver = $facts['os_service_default'],
|
||||
$image_cache_dir = '/var/lib/glance/image-cache',
|
||||
$image_cache_max_size = $facts['os_service_default'],
|
||||
$image_cache_stall_time = $facts['os_service_default'],
|
||||
$image_import_plugins = $facts['os_service_default'],
|
||||
$inject_metadata_properties = $facts['os_service_default'],
|
||||
$ignore_user_roles = $facts['os_service_default'],
|
||||
$image_conversion_output_format = $facts['os_service_default'],
|
||||
$enabled_import_methods = $facts['os_service_default'],
|
||||
$node_staging_uri = $facts['os_service_default'],
|
||||
$worker_self_reference_url = $facts['os_service_default'],
|
||||
$image_member_quota = $facts['os_service_default'],
|
||||
$image_property_quota = $facts['os_service_default'],
|
||||
$image_tag_quota = $facts['os_service_default'],
|
||||
$image_location_quota = $facts['os_service_default'],
|
||||
$image_size_cap = $facts['os_service_default'],
|
||||
$user_storage_quota = $facts['os_service_default'],
|
||||
$task_time_to_live = $facts['os_service_default'],
|
||||
$task_executor = $facts['os_service_default'],
|
||||
$task_work_dir = $facts['os_service_default'],
|
||||
$taskflow_engine_mode = $facts['os_service_default'],
|
||||
$taskflow_max_workers = $facts['os_service_default'],
|
||||
$conversion_format = $facts['os_service_default'],
|
||||
$enable_proxy_headers_parsing = $facts['os_service_default'],
|
||||
$max_request_body_size = $facts['os_service_default'],
|
||||
Boolean $sync_db = true,
|
||||
$limit_param_default = $facts['os_service_default'],
|
||||
$api_limit_max = $facts['os_service_default'],
|
||||
$lock_path = $glance::params::lock_path,
|
||||
$public_endpoint = $facts['os_service_default'],
|
||||
$hashing_algorithm = $facts['os_service_default'],
|
||||
# DEPRECATED PARAMETERS
|
||||
$stores = undef,
|
||||
$default_store = undef,
|
||||
Boolean $multi_store = false,
|
||||
$show_multiple_locations = undef,
|
||||
$filesystem_store_metadata_file = undef,
|
||||
$filesystem_store_file_perm = undef,
|
||||
$delayed_delete = undef,
|
||||
$stores = undef,
|
||||
$default_store = undef,
|
||||
Boolean $multi_store = false,
|
||||
$show_multiple_locations = undef,
|
||||
$filesystem_store_metadata_file = undef,
|
||||
$filesystem_store_file_perm = undef,
|
||||
$delayed_delete = undef,
|
||||
) inherits glance {
|
||||
include glance::deps
|
||||
include glance::policy
|
||||
|
||||
@@ -35,15 +35,6 @@
|
||||
# Optional. Boolean describing if thin provisioning is enabled or not
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*manage_packages*]
|
||||
# Optional. Whether we should manage the packages.
|
||||
# Defaults to true,
|
||||
#
|
||||
# [*package_ensure*]
|
||||
# Optional. Desired ensure state of packages.
|
||||
# accepts latest or specific versions.
|
||||
# Defaults to present.
|
||||
#
|
||||
# [*rados_connect_timeout*]
|
||||
# Optional. Timeout value (in seconds) used when connecting to ceph cluster.
|
||||
# Default: $facts['os_service_default'].
|
||||
@@ -58,17 +49,26 @@
|
||||
# are configured.
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*manage_packages*]
|
||||
# Optional. Whether we should manage the packages.
|
||||
# Defaults to true,
|
||||
#
|
||||
# [*package_ensure*]
|
||||
# Optional. Desired ensure state of packages.
|
||||
# accepts latest or specific versions.
|
||||
# Defaults to present.
|
||||
#
|
||||
define glance::backend::multistore::rbd (
|
||||
$rbd_store_user = $facts['os_service_default'],
|
||||
$rbd_store_ceph_conf = $facts['os_service_default'],
|
||||
$rbd_store_pool = $facts['os_service_default'],
|
||||
$rbd_store_chunk_size = $facts['os_service_default'],
|
||||
$rbd_thin_provisioning = $facts['os_service_default'],
|
||||
Boolean $manage_packages = true,
|
||||
$package_ensure = 'present',
|
||||
$rados_connect_timeout = $facts['os_service_default'],
|
||||
$store_description = $facts['os_service_default'],
|
||||
$weight = $facts['os_service_default'],
|
||||
$rbd_store_user = $facts['os_service_default'],
|
||||
$rbd_store_ceph_conf = $facts['os_service_default'],
|
||||
$rbd_store_pool = $facts['os_service_default'],
|
||||
$rbd_store_chunk_size = $facts['os_service_default'],
|
||||
$rbd_thin_provisioning = $facts['os_service_default'],
|
||||
$rados_connect_timeout = $facts['os_service_default'],
|
||||
$store_description = $facts['os_service_default'],
|
||||
$weight = $facts['os_service_default'],
|
||||
Boolean $manage_packages = true,
|
||||
Stdlib::Ensure::Package $package_ensure = 'present',
|
||||
) {
|
||||
include glance::deps
|
||||
include glance::params
|
||||
|
||||
@@ -81,15 +81,15 @@ define glance::backend::multistore::s3 (
|
||||
$s3_store_access_key,
|
||||
$s3_store_secret_key,
|
||||
$s3_store_bucket,
|
||||
$s3_store_create_bucket_on_put = $facts['os_service_default'],
|
||||
$s3_store_bucket_url_format = $facts['os_service_default'],
|
||||
$s3_store_large_object_size = $facts['os_service_default'],
|
||||
$s3_store_large_object_chunk_size = $facts['os_service_default'],
|
||||
$s3_store_thread_pools = $facts['os_service_default'],
|
||||
$store_description = $facts['os_service_default'],
|
||||
$weight = $facts['os_service_default'],
|
||||
Boolean $manage_packages = true,
|
||||
$package_ensure = 'present',
|
||||
$s3_store_create_bucket_on_put = $facts['os_service_default'],
|
||||
$s3_store_bucket_url_format = $facts['os_service_default'],
|
||||
$s3_store_large_object_size = $facts['os_service_default'],
|
||||
$s3_store_large_object_chunk_size = $facts['os_service_default'],
|
||||
$s3_store_thread_pools = $facts['os_service_default'],
|
||||
$store_description = $facts['os_service_default'],
|
||||
$weight = $facts['os_service_default'],
|
||||
Boolean $manage_packages = true,
|
||||
Stdlib::Ensure::Package $package_ensure = 'present',
|
||||
) {
|
||||
include glance::deps
|
||||
include glance::params
|
||||
|
||||
@@ -21,6 +21,10 @@
|
||||
# Optional. Boolean describing if thin provisioning is enabled or not
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*rados_connect_timeout*]
|
||||
# Optional. Timeout value (in seconds) used when connecting to ceph cluster.
|
||||
# Default: $facts['os_service_default'].
|
||||
#
|
||||
# [*manage_packages*]
|
||||
# Optional. Whether we should manage the packages.
|
||||
# Defaults to true,
|
||||
@@ -30,24 +34,20 @@
|
||||
# accepts latest or specific versions.
|
||||
# Defaults to present.
|
||||
#
|
||||
# [*rados_connect_timeout*]
|
||||
# Optional. Timeout value (in seconds) used when connecting to ceph cluster.
|
||||
# Default: $facts['os_service_default'].
|
||||
#
|
||||
# [*multi_store*]
|
||||
# Optional. Boolean describing if multiple backends will be configured
|
||||
# Defaults to false
|
||||
#
|
||||
class glance::backend::rbd (
|
||||
$rbd_store_user = $facts['os_service_default'],
|
||||
$rbd_store_ceph_conf = $facts['os_service_default'],
|
||||
$rbd_store_pool = $facts['os_service_default'],
|
||||
$rbd_store_chunk_size = $facts['os_service_default'],
|
||||
$rbd_thin_provisioning = $facts['os_service_default'],
|
||||
Boolean $manage_packages = true,
|
||||
$package_ensure = 'present',
|
||||
$rados_connect_timeout = $facts['os_service_default'],
|
||||
Boolean $multi_store = false,
|
||||
$rbd_store_user = $facts['os_service_default'],
|
||||
$rbd_store_ceph_conf = $facts['os_service_default'],
|
||||
$rbd_store_pool = $facts['os_service_default'],
|
||||
$rbd_store_chunk_size = $facts['os_service_default'],
|
||||
$rbd_thin_provisioning = $facts['os_service_default'],
|
||||
$rados_connect_timeout = $facts['os_service_default'],
|
||||
Boolean $manage_packages = true,
|
||||
Stdlib::Ensure::Package $package_ensure = 'present',
|
||||
Boolean $multi_store = false,
|
||||
) {
|
||||
include glance::deps
|
||||
include glance::params
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
# Defaults to 'present'
|
||||
#
|
||||
class glance::client (
|
||||
$ensure = 'present'
|
||||
Stdlib::Ensure::Package $ensure = 'present'
|
||||
) {
|
||||
include glance::deps
|
||||
include glance::params
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
# Defaults to 'present'
|
||||
#
|
||||
class glance (
|
||||
$package_ensure = 'present'
|
||||
Stdlib::Ensure::Package $package_ensure = 'present',
|
||||
) {
|
||||
include glance::deps
|
||||
include glance::params
|
||||
|
||||
Reference in New Issue
Block a user