openstack/puppet-manila
Code Issues Proposed changes

Replace legacy facts and use fact hash

Browse Source 
... because the latest lint no longer allows usage of legacy facts and
top scope fact.

Change-Id: I7de4bd06c59b921c8774accf462db1cf434d5cf6
This commit is contained in:
Takashi Kajinami 2023-03-02 11:16:22 +09:00
parent 0d31bdbdaf
commit c6e82df318
59 changed files with 508 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/api.pp
View File

@ -19,7 +19,7 @@
# [*default_share_type*] # [*default_share_type*]
# (optional) Name of default share type which is used if user doesn't # (optional) Name of default share type which is used if user doesn't
# set a share type explicitly when creating a share. # set a share type explicitly when creating a share.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*enabled*] # [*enabled*]
# (optional) The state of the service # (optional) The state of the service
@ -53,35 +53,35 @@
# [*enable_proxy_headers_parsing*] # [*enable_proxy_headers_parsing*]
# (Optional) Enable paste middleware to handle SSL requests through # (Optional) Enable paste middleware to handle SSL requests through
# HTTPProxyToWSGI middleware. # HTTPProxyToWSGI middleware.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*max_request_body_size*] # [*max_request_body_size*]
# (Optional) Set max request body size # (Optional) Set max request body size
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*enabled_share_protocols*] # [*enabled_share_protocols*]
# (optional) Defines the enabled share protocols provided by Manila. # (optional) Defines the enabled share protocols provided by Manila.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*service_workers*] # [*service_workers*]
# (optional) Number of manila-api workers # (optional) Number of manila-api workers
# Defaults to $::os_workers # Defaults to $facts['os_workers']
# #
class manila::api ( class manila::api (
$auth_strategy = 'keystone', $auth_strategy = 'keystone',
$package_ensure = 'present', $package_ensure = 'present',
$bind_host = '0.0.0.0', $bind_host = '0.0.0.0',
$default_share_type = $::os_service_default, $default_share_type = $facts['os_service_default'],
$enabled = true, $enabled = true,
$sync_db = true, $sync_db = true,
$manage_service = true, $manage_service = true,
$service_name = $::manila::params::api_service, $service_name = $::manila::params::api_service,
$ratelimits = undef, $ratelimits = undef,
$ratelimits_factory = 'manila.api.v1.limits:RateLimitingMiddleware.factory', $ratelimits_factory = 'manila.api.v1.limits:RateLimitingMiddleware.factory',
$enable_proxy_headers_parsing = $::os_service_default, $enable_proxy_headers_parsing = $facts['os_service_default'],
$max_request_body_size = $::os_service_default, $max_request_body_size = $facts['os_service_default'],
$enabled_share_protocols = $::os_service_default, $enabled_share_protocols = $facts['os_service_default'],
$service_workers = $::os_workers, $service_workers = $facts['os_workers'],
) inherits manila::params { ) inherits manila::params {
include manila::deps include manila::deps

36
manifests/backend/cephfs.pp
View File

@ -17,7 +17,7 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*cephfs_conf_path*] # [*cephfs_conf_path*]
# (optional) Path to cephfs config. # (optional) Path to cephfs config.
@ -33,36 +33,36 @@
# #
# [*cephfs_ganesha_server_ip*] # [*cephfs_ganesha_server_ip*]
# (optional) IP of a server where Ganesha service runs on. # (optional) IP of a server where Ganesha service runs on.
# Defaults to: $::os_service_default # Defaults to: $facts['os_service_default']
# #
# [*cephfs_ganesha_export_ips*] # [*cephfs_ganesha_export_ips*]
# (optional) List of IPs on which Ganesha provides NFS share service. # (optional) List of IPs on which Ganesha provides NFS share service.
# Defaults to: $::os_service_default # Defaults to: $facts['os_service_default']
# #
# [*cephfs_ganesha_server_is_remote*] # [*cephfs_ganesha_server_is_remote*]
# (required) Whether the Ganesha service is remote or colocated on the # (required) Whether the Ganesha service is remote or colocated on the
# same node where the Share service runs. # same node where the Share service runs.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*cephfs_ganesha_server_username*] # [*cephfs_ganesha_server_username*]
# (optional) The username to use when logging on the remote node # (optional) The username to use when logging on the remote node
# hosting the Ganesha service # hosting the Ganesha service
# Defaults to: $::os_service_default # Defaults to: $facts['os_service_default']
# #
# [*cephfs_ganesha_server_password*] # [*cephfs_ganesha_server_password*]
# (optional) The password to use when logging on the remote node # (optional) The password to use when logging on the remote node
# hosting the Ganesha service # hosting the Ganesha service
# Defaults to: $::os_service_default # Defaults to: $facts['os_service_default']
# #
# [*cephfs_ganesha_path_to_private_key*] # [*cephfs_ganesha_path_to_private_key*]
# (optional) The secret key to use when logging on the remote node # (optional) The secret key to use when logging on the remote node
# hosting the Ganesha service (prevails on server_password) # hosting the Ganesha service (prevails on server_password)
# Defaults to: $::os_service_default # Defaults to: $facts['os_service_default']
# #
# [*cephfs_volume_mode*] # [*cephfs_volume_mode*]
# (optional) octal rwx permissions for CephFS backing volumes, # (optional) octal rwx permissions for CephFS backing volumes,
# snapshots, and groups of volumes and snapshots. # snapshots, and groups of volumes and snapshots.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*cephfs_protocol_helper_type*] # [*cephfs_protocol_helper_type*]
# (optional) Sets helper type for CephFS driver, can be CEPHFS or NFS # (optional) Sets helper type for CephFS driver, can be CEPHFS or NFS
@ -71,24 +71,24 @@
# [*cephfs_filesystem_name*] # [*cephfs_filesystem_name*]
# (optional) The name of the filesystem to use, if there are multiple # (optional) The name of the filesystem to use, if there are multiple
# filesystems in the cluster. # filesystems in the cluster.
# Defaults to: $::os_service_default # Defaults to: $facts['os_service_default']
# #
define manila::backend::cephfs ( define manila::backend::cephfs (
$driver_handles_share_servers = false, $driver_handles_share_servers = false,
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$cephfs_conf_path = '$state_path/ceph.conf', $cephfs_conf_path = '$state_path/ceph.conf',
$cephfs_auth_id = 'manila', $cephfs_auth_id = 'manila',
$cephfs_cluster_name = 'ceph', $cephfs_cluster_name = 'ceph',
$cephfs_ganesha_server_ip = $::os_service_default, $cephfs_ganesha_server_ip = $facts['os_service_default'],
$cephfs_ganesha_export_ips = $::os_service_default, $cephfs_ganesha_export_ips = $facts['os_service_default'],
$cephfs_ganesha_server_is_remote = $::os_service_default, $cephfs_ganesha_server_is_remote = $facts['os_service_default'],
$cephfs_ganesha_server_username = $::os_service_default, $cephfs_ganesha_server_username = $facts['os_service_default'],
$cephfs_ganesha_server_password = $::os_service_default, $cephfs_ganesha_server_password = $facts['os_service_default'],
$cephfs_ganesha_path_to_private_key = $::os_service_default, $cephfs_ganesha_path_to_private_key = $facts['os_service_default'],
$cephfs_volume_mode = $::os_service_default, $cephfs_volume_mode = $facts['os_service_default'],
$cephfs_protocol_helper_type = 'CEPHFS', $cephfs_protocol_helper_type = 'CEPHFS',
$cephfs_filesystem_name = $::os_service_default, $cephfs_filesystem_name = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps

8
manifests/backend/dellemc_isilon.pp
View File

@ -28,11 +28,11 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*emc_nas_root_dir*] # [*emc_nas_root_dir*]
# (optional) The root directory where shares will be located. # (optional) The root directory where shares will be located.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*emc_nas_server_port*] # [*emc_nas_server_port*]
# (optional) Port number for the Dell EMC isilon server. # (optional) Port number for the Dell EMC isilon server.
@ -66,8 +66,8 @@ define manila::backend::dellemc_isilon (
$emc_nas_server, $emc_nas_server,
$emc_share_backend = 'isilon', $emc_share_backend = 'isilon',
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$emc_nas_root_dir = $::os_service_default, $emc_nas_root_dir = $facts['os_service_default'],
$emc_nas_server_port = 8080, $emc_nas_server_port = 8080,
$emc_nas_server_secure = true, $emc_nas_server_secure = true,
$package_ensure = 'present', $package_ensure = 'present',

28
manifests/backend/dellemc_powermax.pp
View File

@ -28,35 +28,35 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*powermax_server_container*] # [*powermax_server_container*]
# (optional) Name of the Data Mover to serve the share service. # (optional) Name of the Data Mover to serve the share service.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*powermax_share_data_pools*] # [*powermax_share_data_pools*]
# (optional) Comma separated list specifying the name of the pools to be # (optional) Comma separated list specifying the name of the pools to be
# used by this back end. Do not set this option if all storage pools on the # used by this back end. Do not set this option if all storage pools on the
# system can be used. Wild card character is supported # system can be used. Wild card character is supported
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*powermax_ethernet_ports*] # [*powermax_ethernet_ports*]
# (optional) Comma-separated list specifying the ports (devices) of Data Mover # (optional) Comma-separated list specifying the ports (devices) of Data Mover
# that can be used for share server interface. Do not set this option if all # that can be used for share server interface. Do not set this option if all
# ports on the Data Mover can be used. Wild card character is supported. # ports on the Data Mover can be used. Wild card character is supported.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*emc_nas_server_secure*] # [*emc_nas_server_secure*]
# (optional) Use SSL validation # (optional) Use SSL validation
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*emc_ssl_cert_path*] # [*emc_ssl_cert_path*]
# (optional) Path to SSL certificates # (optional) Path to SSL certificates
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*emc_ssl_cert_verify*] # [*emc_ssl_cert_verify*]
# (optional) Verify SSL certificates # (optional) Verify SSL certificates
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*package_ensure*] # [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'. # (optional) Ensure state for package. Defaults to 'present'.
@ -75,13 +75,13 @@ define manila::backend::dellemc_powermax (
$emc_nas_server, $emc_nas_server,
$emc_share_backend = 'powermax', $emc_share_backend = 'powermax',
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$powermax_server_container = $::os_service_default, $powermax_server_container = $facts['os_service_default'],
$powermax_share_data_pools = $::os_service_default, $powermax_share_data_pools = $facts['os_service_default'],
$powermax_ethernet_ports = $::os_service_default, $powermax_ethernet_ports = $facts['os_service_default'],
$emc_nas_server_secure = $::os_service_default, $emc_nas_server_secure = $facts['os_service_default'],
$emc_ssl_cert_path = $::os_service_default, $emc_ssl_cert_path = $facts['os_service_default'],
$emc_ssl_cert_verify = $::os_service_default, $emc_ssl_cert_verify = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
) { ) {

22
manifests/backend/dellemc_unity.pp
View File

@ -37,29 +37,29 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*unity_share_data_pools*] # [*unity_share_data_pools*]
# (optional) Comma separated list specifying the name of the pools to be # (optional) Comma separated list specifying the name of the pools to be
# used by this back end. Do not set this option if all storage pools on the # used by this back end. Do not set this option if all storage pools on the
# system can be used. Wild card character is supported # system can be used. Wild card character is supported
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*unity_ethernet_ports*] # [*unity_ethernet_ports*]
# (optional) Comma separated list specifying the ethernet ports of Unity # (optional) Comma separated list specifying the ethernet ports of Unity
# system that can be used for share. Do not set this option if all ethernet # system that can be used for share. Do not set this option if all ethernet
# ports can be used. Wild card character is supported. Both the normal ethernet # ports can be used. Wild card character is supported. Both the normal ethernet
# port and link aggregation port can be used by Unity share driver. # port and link aggregation port can be used by Unity share driver.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*unity_share_server*] # [*unity_share_server*]
# (optional) NAS server used for creating share when driver is in DHSS=False # (optional) NAS server used for creating share when driver is in DHSS=False
# mode. It is required when driver_handles_share_servers=False in manila.conf. # mode. It is required when driver_handles_share_servers=False in manila.conf.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*report_default_filter_function*] # [*report_default_filter_function*]
# (optional) Whether or not report default filter function. # (optional) Whether or not report default filter function.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*network_plugin_ipv6_enabled*] # [*network_plugin_ipv6_enabled*]
# (optional) Whether to support IPv6 network resource, Default=False. # (optional) Whether to support IPv6 network resource, Default=False.
@ -99,14 +99,14 @@ define manila::backend::dellemc_unity (
$unity_server_meta_pool, $unity_server_meta_pool,
$emc_share_backend = 'unity', $emc_share_backend = 'unity',
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$unity_share_data_pools = $::os_service_default, $unity_share_data_pools = $facts['os_service_default'],
$unity_ethernet_ports = $::os_service_default, $unity_ethernet_ports = $facts['os_service_default'],
$unity_share_server = $::os_service_default, $unity_share_server = $facts['os_service_default'],
$report_default_filter_function = $::os_service_default, $report_default_filter_function = $facts['os_service_default'],
$network_plugin_ipv6_enabled = true, $network_plugin_ipv6_enabled = true,
$emc_ssl_cert_verify = undef, $emc_ssl_cert_verify = undef,
$emc_ssl_cert_path = $::os_service_default, $emc_ssl_cert_path = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
) { ) {

20
manifests/backend/dellemc_vnx.pp
View File

@ -28,23 +28,23 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*vnx_server_container*] # [*vnx_server_container*]
# (optional) Name of the Data Mover to serve the share service. # (optional) Name of the Data Mover to serve the share service.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*vnx_share_data_pools*] # [*vnx_share_data_pools*]
# (optional) Comma separated list specifying the name of the pools to be # (optional) Comma separated list specifying the name of the pools to be
# used by this back end. Do not set this option if all storage pools on the # used by this back end. Do not set this option if all storage pools on the
# system can be used. Wild card character is supported # system can be used. Wild card character is supported
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*vnx_ethernet_ports*] # [*vnx_ethernet_ports*]
# (optional) Comma-separated list specifying the ports (devices) of Data Mover # (optional) Comma-separated list specifying the ports (devices) of Data Mover
# that can be used for share server interface. Do not set this option if all # that can be used for share server interface. Do not set this option if all
# ports on the Data Mover can be used. Wild card character is supported. # ports on the Data Mover can be used. Wild card character is supported.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*network_plugin_ipv6_enabled*] # [*network_plugin_ipv6_enabled*]
# (optional) Whether to support IPv6 network resource, Default=False. # (optional) Whether to support IPv6 network resource, Default=False.
@ -61,7 +61,7 @@
# (optional) Can be used to specify a non default path to a # (optional) Can be used to specify a non default path to a
# CA_BUNDLE file or directory with certificates of trusted # CA_BUNDLE file or directory with certificates of trusted
# CAs, which will be used to validate the backend. # CAs, which will be used to validate the backend.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*package_ensure*] # [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'. # (optional) Ensure state for package. Defaults to 'present'.
@ -89,13 +89,13 @@ define manila::backend::dellemc_vnx (
$emc_nas_server, $emc_nas_server,
$emc_share_backend = 'vnx', $emc_share_backend = 'vnx',
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$vnx_server_container = $::os_service_default, $vnx_server_container = $facts['os_service_default'],
$vnx_share_data_pools = $::os_service_default, $vnx_share_data_pools = $facts['os_service_default'],
$vnx_ethernet_ports = $::os_service_default, $vnx_ethernet_ports = $facts['os_service_default'],
$network_plugin_ipv6_enabled = true, $network_plugin_ipv6_enabled = true,
$emc_ssl_cert_verify = undef, $emc_ssl_cert_verify = undef,
$emc_ssl_cert_path = $::os_service_default, $emc_ssl_cert_path = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
$driver_handles_share_servers = undef, $driver_handles_share_servers = undef,
) { ) {

4
manifests/backend/flashblade.pp
View File

@ -22,7 +22,7 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*flashblade_eradicate*] # [*flashblade_eradicate*]
# (optional) Fully eradicate deleted shares and snapshots. # (optional) Fully eradicate deleted shares and snapshots.
@ -45,7 +45,7 @@ define manila::backend::flashblade (
$flashblade_mgmt_vip, $flashblade_mgmt_vip,
$flashblade_eradicate = true, $flashblade_eradicate = true,
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
) { ) {

40
manifests/backend/ganesha.pp
View File

@ -12,60 +12,60 @@
# #
# [*ganesha_config_dir*] # [*ganesha_config_dir*]
# (optional) Directory where Ganesha config files are stored. # (optional) Directory where Ganesha config files are stored.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_config_path*] # [*ganesha_config_path*]
# (optional) Path to main Ganesha config file. # (optional) Path to main Ganesha config file.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_service_name*] # [*ganesha_service_name*]
# (optional) Name of the ganesha nfs service. # (optional) Name of the ganesha nfs service.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_db_path*] # [*ganesha_db_path*]
# (optional) Location of Ganesha database file (Ganesha module only). # (optional) Location of Ganesha database file (Ganesha module only).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_export_dir*] # [*ganesha_export_dir*]
# (optional) Path to directory containing Ganesha export configuration. # (optional) Path to directory containing Ganesha export configuration.
# (Ganesha module only.) # (Ganesha module only.)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_export_template_dir*] # [*ganesha_export_template_dir*]
# (optional) Path to directory containing Ganesha export block templates. # (optional) Path to directory containing Ganesha export block templates.
# (Ganesha module only.) # (Ganesha module only.)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_rados_store_enable*] # [*ganesha_rados_store_enable*]
# (optional) Persist Ganesha exports and export counter in Ceph RADOS objects # (optional) Persist Ganesha exports and export counter in Ceph RADOS objects
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_rados_store_pool_name*] # [*ganesha_rados_store_pool_name*]
# (optional) Name of the Ceph RADOS pool to store Ganesha exports and export # (optional) Name of the Ceph RADOS pool to store Ganesha exports and export
# counter. # counter.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_rados_export_counter*] # [*ganesha_rados_export_counter*]
# (optional) Name of the CEPH RADOS object used as the Ganesha export counter. # (optional) Name of the CEPH RADOS object used as the Ganesha export counter.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_rados_export_index*] # [*ganesha_rados_export_index*]
# (optional) Name of the CEPH RADOS object used to store a list of the export # (optional) Name of the CEPH RADOS object used to store a list of the export
# RADOS object URLs. # RADOS object URLs.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
define manila::backend::ganesha ( define manila::backend::ganesha (
$share_backend_name = $name, $share_backend_name = $name,
$ganesha_config_dir = $::os_service_default, $ganesha_config_dir = $facts['os_service_default'],
$ganesha_config_path = $::os_service_default, $ganesha_config_path = $facts['os_service_default'],
$ganesha_service_name = $::os_service_default, $ganesha_service_name = $facts['os_service_default'],
$ganesha_db_path = $::os_service_default, $ganesha_db_path = $facts['os_service_default'],
$ganesha_export_dir = $::os_service_default, $ganesha_export_dir = $facts['os_service_default'],
$ganesha_export_template_dir = $::os_service_default, $ganesha_export_template_dir = $facts['os_service_default'],
$ganesha_rados_store_enable = $::os_service_default, $ganesha_rados_store_enable = $facts['os_service_default'],
$ganesha_rados_store_pool_name = $::os_service_default, $ganesha_rados_store_pool_name = $facts['os_service_default'],
$ganesha_rados_export_counter = $::os_service_default, $ganesha_rados_export_counter = $facts['os_service_default'],
$ganesha_rados_export_index = $::os_service_default, $ganesha_rados_export_index = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps

4
manifests/backend/generic.pp
View File

@ -15,7 +15,7 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*smb_template_config_path*] # [*smb_template_config_path*]
# (optional) Path to smb config. # (optional) Path to smb config.
@ -78,7 +78,7 @@
define manila::backend::generic ( define manila::backend::generic (
$driver_handles_share_servers, $driver_handles_share_servers,
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$smb_template_config_path = '$state_path/smb.conf', $smb_template_config_path = '$state_path/smb.conf',
$volume_name_template = 'manila-share-%s', $volume_name_template = 'manila-share-%s',
$volume_snapshot_name_template = 'manila-snapshot-%s', $volume_snapshot_name_template = 'manila-snapshot-%s',

4
manifests/backend/glusterfs.pp
View File

@ -12,7 +12,7 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*glusterfs_volumes_config*] # [*glusterfs_volumes_config*]
# (required) File with the list of Gluster volumes that can be used to # (required) File with the list of Gluster volumes that can be used to
@ -30,7 +30,7 @@
# #
define manila::backend::glusterfs ( define manila::backend::glusterfs (
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$glusterfs_volumes_config = '/etc/manila/glusterfs_volumes', $glusterfs_volumes_config = '/etc/manila/glusterfs_volumes',
$glusterfs_mount_point_base = '$state_path/mnt', $glusterfs_mount_point_base = '$state_path/mnt',
) { ) {

4
manifests/backend/glusternative.pp
View File

@ -25,7 +25,7 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*package_ensure*] # [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'. # (optional) Ensure state for package. Defaults to 'present'.
@ -35,7 +35,7 @@ define manila::backend::glusternative (
$glusterfs_volume_pattern, $glusterfs_volume_pattern,
$glusterfs_path_to_private_key, $glusterfs_path_to_private_key,
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
) { ) {

4
manifests/backend/glusternfs.pp
View File

@ -32,7 +32,7 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*package_ensure*] # [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'. # (optional) Ensure state for package. Defaults to 'present'.
@ -45,7 +45,7 @@ define manila::backend::glusternfs (
$glusterfs_path_to_private_key, $glusterfs_path_to_private_key,
$glusterfs_ganesha_server_ip, $glusterfs_ganesha_server_ip,
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
) { ) {

4
manifests/backend/hitachi_hnas.pp
View File

@ -39,7 +39,7 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*package_ensure*] # [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'. # (optional) Ensure state for package. Defaults to 'present'.
@ -65,7 +65,7 @@ define manila::backend::hitachi_hnas (
$hitachi_hnas_file_system_name, $hitachi_hnas_file_system_name,
$driver_handles_share_servers = false, $driver_handles_share_servers = false,
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
) { ) {

20
manifests/backend/lvm.pp
View File

@ -16,24 +16,24 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*lvm_share_export_root*] # [*lvm_share_export_root*]
# (optional) Base folder where exported shares are located. # (optional) Base folder where exported shares are located.
# Defaults to: $::os_service_default # Defaults to: $facts['os_service_default']
# #
# [*lvm_share_mirrors*] # [*lvm_share_mirrors*]
# (optional) If set, create LVMs with multiple mirrors. Note that this requires # (optional) If set, create LVMs with multiple mirrors. Note that this requires
# lvm_mirrors + 2 PVs with available space. # lvm_mirrors + 2 PVs with available space.
# Defaults to: $::os_service_default # Defaults to: $facts['os_service_default']
# [*lvm_share_volume_group*] # [*lvm_share_volume_group*]
# (optional) Name for the VG that will contain exported shares. (string value) # (optional) Name for the VG that will contain exported shares. (string value)
# Defaults to: $::os_service_default # Defaults to: $facts['os_service_default']
# [*lvm_share_helpers*] # [*lvm_share_helpers*]
# (optional) Specify list of share export helpers. (list value) # (optional) Specify list of share export helpers. (list value)
# Defaults to: $::os_service_default # Defaults to: $facts['os_service_default']
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
@ -47,11 +47,11 @@
define manila::backend::lvm ( define manila::backend::lvm (
$lvm_share_export_ips, $lvm_share_export_ips,
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$lvm_share_export_root = $::os_service_default, $lvm_share_export_root = $facts['os_service_default'],
$lvm_share_mirrors = $::os_service_default, $lvm_share_mirrors = $facts['os_service_default'],
$lvm_share_volume_group = $::os_service_default, $lvm_share_volume_group = $facts['os_service_default'],
$lvm_share_helpers = $::os_service_default, $lvm_share_helpers = $facts['os_service_default'],
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$driver_handles_share_servers = undef, $driver_handles_share_servers = undef,
) { ) {

52
manifests/backend/netapp.pp
View File

@ -30,71 +30,71 @@
# (Optional) Availability zone for this share backend. # (Optional) Availability zone for this share backend.
# If not set, the storage_availability_zone option value # If not set, the storage_availability_zone option value
# is used as the default for all backends. # is used as the default for all backends.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_transport_type*] # [*netapp_transport_type*]
# (optional) The transport protocol used when communicating with # (optional) The transport protocol used when communicating with
# the storage system or proxy server. Valid values are # the storage system or proxy server. Valid values are
# http or https. # http or https.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_storage_family*] # [*netapp_storage_family*]
# (optional) The storage family type used on the storage system; valid # (optional) The storage family type used on the storage system; valid
# values are ontap_cluster for clustered Data ONTAP. # values are ontap_cluster for clustered Data ONTAP.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_server_port*] # [*netapp_server_port*]
# (optional) The TCP port to use for communication with the storage system # (optional) The TCP port to use for communication with the storage system
# or proxy server. If not specified, Data ONTAP drivers will use 80 for HTTP # or proxy server. If not specified, Data ONTAP drivers will use 80 for HTTP
# and 443 for HTTPS. # and 443 for HTTPS.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_volume_name_template*] # [*netapp_volume_name_template*]
# (optional) NetApp volume name template. # (optional) NetApp volume name template.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_vserver*] # [*netapp_vserver*]
# (optional) This option specifies the storage virtual machine (previously # (optional) This option specifies the storage virtual machine (previously
# called a Vserver) name on the storage cluster on which provisioning of # called a Vserver) name on the storage cluster on which provisioning of
# shared file systems should occur. This option only applies # shared file systems should occur. This option only applies
# when the option driver_handles_share_servers is set to False. # when the option driver_handles_share_servers is set to False.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_vserver_name_template*] # [*netapp_vserver_name_template*]
# (optional) Name template to use for new vserver. This option only applies # (optional) Name template to use for new vserver. This option only applies
# when the option driver_handles_share_servers is set to True. # when the option driver_handles_share_servers is set to True.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_lif_name_template*] # [*netapp_lif_name_template*]
# (optional) Logical interface (LIF) name template. This option only applies # (optional) Logical interface (LIF) name template. This option only applies
# when the option driver_handles_share_servers is set to True. # when the option driver_handles_share_servers is set to True.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_aggregate_name_search_pattern*] # [*netapp_aggregate_name_search_pattern*]
# (optional) Pattern for searching available aggregates # (optional) Pattern for searching available aggregates
# for provisioning. # for provisioning.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_root_volume_aggregate*] # [*netapp_root_volume_aggregate*]
# (optional) Name of aggregate to create root volume on. This option only # (optional) Name of aggregate to create root volume on. This option only
# applies when the option driver_handles_share_servers is set to True. # applies when the option driver_handles_share_servers is set to True.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_root_volume*] # [*netapp_root_volume*]
# (optional) Root volume name. This option only applies when the option # (optional) Root volume name. This option only applies when the option
# driver_handles_share_servers is set to True. # driver_handles_share_servers is set to True.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*netapp_port_name_search_pattern*] # [*netapp_port_name_search_pattern*]
# (optional) Pattern for overriding the selection of network ports on which # (optional) Pattern for overriding the selection of network ports on which
# to create Vserver LIFs. # to create Vserver LIFs.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*netapp_trace_flags*] # [*netapp_trace_flags*]
# (optional) This option is a comma-separated list of options (valid values # (optional) This option is a comma-separated list of options (valid values
# include method and api) that controls which trace info is written to the # include method and api) that controls which trace info is written to the
# Manila logs when the debug level is set to True. # Manila logs when the debug level is set to True.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*package_ensure*] # [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'. # (optional) Ensure state for package. Defaults to 'present'.
@ -116,19 +116,19 @@ define manila::backend::netapp (
$netapp_password, $netapp_password,
$netapp_server_hostname, $netapp_server_hostname,
$share_backend_name = $name, $share_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $facts['os_service_default'],
$netapp_transport_type = $::os_service_default, $netapp_transport_type = $facts['os_service_default'],
$netapp_storage_family = $::os_service_default, $netapp_storage_family = $facts['os_service_default'],
$netapp_server_port = $::os_service_default, $netapp_server_port = $facts['os_service_default'],
$netapp_volume_name_template = $::os_service_default, $netapp_volume_name_template = $facts['os_service_default'],
$netapp_vserver = $::os_service_default, $netapp_vserver = $facts['os_service_default'],
$netapp_vserver_name_template = $::os_service_default, $netapp_vserver_name_template = $facts['os_service_default'],
$netapp_lif_name_template = $::os_service_default, $netapp_lif_name_template = $facts['os_service_default'],
$netapp_aggregate_name_search_pattern = $::os_service_default, $netapp_aggregate_name_search_pattern = $facts['os_service_default'],
$netapp_root_volume_aggregate = $::os_service_default, $netapp_root_volume_aggregate = $facts['os_service_default'],
$netapp_root_volume = $::os_service_default, $netapp_root_volume = $facts['os_service_default'],
$netapp_port_name_search_pattern = $::os_service_default, $netapp_port_name_search_pattern = $facts['os_service_default'],
$netapp_trace_flags = $::os_service_default, $netapp_trace_flags = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
) { ) {

36
manifests/compute/nova.pp
View File

@ -6,11 +6,11 @@
# #
# [*insecure*] # [*insecure*]
# (optional) Verify HTTPS connections # (optional) Verify HTTPS connections
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_url*] # [*auth_url*]
# (optional) Authentication URL # (optional) Authentication URL
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_type*] # [*auth_type*]
# (optional) Authentication type to load # (optional) Authentication type to load
@ -19,7 +19,7 @@
# [*cafile*] # [*cafile*]
# (optional) PEM encoded Certificate Authority to use when verifying HTTPS # (optional) PEM encoded Certificate Authority to use when verifying HTTPS
# connections. # connections.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*user_domain_name*] # [*user_domain_name*]
# (optional) User's domain name # (optional) User's domain name
@ -35,16 +35,16 @@
# #
# [*system_scope*] # [*system_scope*]
# (optional) Scope for system operations. # (optional) Scope for system operations.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (optional) Region name for connecting to nova # (optional) Region name for connecting to nova
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*endpoint_type*] # [*endpoint_type*]
# (optional) The type of nova endpoint to use when # (optional) The type of nova endpoint to use when
# looking up in the keystone catalog. # looking up in the keystone catalog.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*username*] # [*username*]
# (optional) Username # (optional) Username
@ -52,26 +52,26 @@
# #
# [*password*] # [*password*]
# (optional) User's password # (optional) User's password
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*api_microversion*] # [*api_microversion*]
# (optional) Version of Nova API to be used # (optional) Version of Nova API to be used
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class manila::compute::nova ( class manila::compute::nova (
$insecure = $::os_service_default, $insecure = $facts['os_service_default'],
$auth_url = $::os_service_default, $auth_url = $facts['os_service_default'],
$auth_type = 'password', $auth_type = 'password',
$cafile = $::os_service_default, $cafile = $facts['os_service_default'],
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',
$project_name = 'services', $project_name = 'services',
$system_scope = $::os_service_default, $system_scope = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$username = 'nova', $username = 'nova',
$password = $::os_service_default, $password = $facts['os_service_default'],
$api_microversion = $::os_service_default, $api_microversion = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps
@ -80,8 +80,8 @@ class manila::compute::nova (
$project_name_real = $project_name $project_name_real = $project_name
$project_domain_name_real = $project_domain_name $project_domain_name_real = $project_domain_name
} else { } else {
$project_name_real = $::os_service_default $project_name_real = $facts['os_service_default']
$project_domain_name_real = $::os_service_default $project_domain_name_real = $facts['os_service_default']
} }
manila_config { manila_config {

4
manifests/coordination.pp
View File

@ -6,10 +6,10 @@
# #
# [*backend_url*] # [*backend_url*]
# (Optional) Coordination backend URL. # (Optional) Coordination backend URL.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class manila::coordination ( class manila::coordination (
$backend_url = $::os_service_default, $backend_url = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps

24
manifests/cors.pp
View File

@ -8,41 +8,41 @@
# (Optional) Indicate whether this resource may be shared with the domain # (Optional) Indicate whether this resource may be shared with the domain
# received in the requests "origin" header. # received in the requests "origin" header.
# (string value) # (string value)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*allow_credentials*] # [*allow_credentials*]
# (Optional) Indicate that the actual request can include user credentials. # (Optional) Indicate that the actual request can include user credentials.
# (boolean value) # (boolean value)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*expose_headers*] # [*expose_headers*]
# (Optional) Indicate which headers are safe to expose to the API. # (Optional) Indicate which headers are safe to expose to the API.
# (list value) # (list value)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*max_age*] # [*max_age*]
# (Optional) Maximum cache age of CORS preflight requests. # (Optional) Maximum cache age of CORS preflight requests.
# (integer value) # (integer value)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*allow_methods*] # [*allow_methods*]
# (Optional) Indicate which methods can be used during the actual request. # (Optional) Indicate which methods can be used during the actual request.
# (list value) # (list value)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*allow_headers*] # [*allow_headers*]
# (Optional) Indicate which header field names may be used during the actual # (Optional) Indicate which header field names may be used during the actual
# request. # request.
# (list value) # (list value)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class manila::cors ( class manila::cors (
$allowed_origin = $::os_service_default, $allowed_origin = $facts['os_service_default'],
$allow_credentials = $::os_service_default, $allow_credentials = $facts['os_service_default'],
$expose_headers = $::os_service_default, $expose_headers = $facts['os_service_default'],
$max_age = $::os_service_default, $max_age = $facts['os_service_default'],
$allow_methods = $::os_service_default, $allow_methods = $facts['os_service_default'],
$allow_headers = $::os_service_default, $allow_headers = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps

8
manifests/data.pp
View File

@ -18,19 +18,19 @@
# #
# [*mount_tmp_location*] # [*mount_tmp_location*]
# (Optional) Temporary path to create and mount shares during migration. # (Optional) Temporary path to create and mount shares during migration.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*check_hash*] # [*check_hash*]
# (Optional) Chooses whether hash of each file should be checked on data # (Optional) Chooses whether hash of each file should be checked on data
# copying. # copying.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class manila::data ( class manila::data (
$package_ensure = 'present', $package_ensure = 'present',
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
$mount_tmp_location = $::os_service_default, $mount_tmp_location = $facts['os_service_default'],
$check_hash = $::os_service_default, $check_hash = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps

32
manifests/db.pp
View File

@ -10,49 +10,49 @@
# #
# [*database_connection_recycle_time*] # [*database_connection_recycle_time*]
# Timeout when db connections should be reaped. # Timeout when db connections should be reaped.
# (Optional) Defaults to $::os_service_default # (Optional) Defaults to $facts['os_service_default']
# #
# [*database_max_pool_size*] # [*database_max_pool_size*]
# Maximum number of SQL connections to keep open in a pool. # Maximum number of SQL connections to keep open in a pool.
# (Optional) Defaults to $::os_service_default # (Optional) Defaults to $facts['os_service_default']
# #
# [*database_max_retries*] # [*database_max_retries*]
# Maximum db connection retries during startup. # Maximum db connection retries during startup.
# Setting -1 implies an infinite retry count. # Setting -1 implies an infinite retry count.
# (Optional) Defaults to $::os_service_default # (Optional) Defaults to $facts['os_service_default']
# #
# [*database_retry_interval*] # [*database_retry_interval*]
# Interval between retries of opening a sql connection. # Interval between retries of opening a sql connection.
# (Optional) Defaults to $::os_service_default # (Optional) Defaults to $facts['os_service_default']
# #
# [*database_max_overflow*] # [*database_max_overflow*]
# If set, use this value for max_overflow with sqlalchemy. # If set, use this value for max_overflow with sqlalchemy.
# (Optional) Defaults to $::os_service_default # (Optional) Defaults to $facts['os_service_default']
# #
# [*database_pool_timeout*] # [*database_pool_timeout*]
# (Optional) If set, use this value for pool_timeout with SQLAlchemy. # (Optional) If set, use this value for pool_timeout with SQLAlchemy.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*mysql_enable_ndb*] # [*mysql_enable_ndb*]
# (Optional) If True, transparently enables support for handling MySQL # (Optional) If True, transparently enables support for handling MySQL
# Cluster (NDB). # Cluster (NDB).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*database_db_max_retries*] # [*database_db_max_retries*]
# (optional) Maximum retries in case of connection error or deadlock error # (optional) Maximum retries in case of connection error or deadlock error
# before error is raised. Set to -1 to specify an infinite retry count. # before error is raised. Set to -1 to specify an infinite retry count.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class manila::db ( class manila::db (
$database_connection = 'sqlite:////var/lib/manila/manila.sqlite', $database_connection = 'sqlite:////var/lib/manila/manila.sqlite',
$database_connection_recycle_time = $::os_service_default, $database_connection_recycle_time = $facts['os_service_default'],
$database_max_pool_size = $::os_service_default, $database_max_pool_size = $facts['os_service_default'],
$database_max_retries = $::os_service_default, $database_max_retries = $facts['os_service_default'],
$database_retry_interval = $::os_service_default, $database_retry_interval = $facts['os_service_default'],
$database_max_overflow = $::os_service_default, $database_max_overflow = $facts['os_service_default'],
$database_pool_timeout = $::os_service_default, $database_pool_timeout = $facts['os_service_default'],
$mysql_enable_ndb = $::os_service_default, $mysql_enable_ndb = $facts['os_service_default'],
$database_db_max_retries = $::os_service_default, $database_db_max_retries = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps

24
manifests/ganesha.pp
View File

@ -6,37 +6,37 @@
# === Parameters # === Parameters
# [*ganesha_config_dir*] # [*ganesha_config_dir*]
# (optional) Directory where Ganesha config files are stored. # (optional) Directory where Ganesha config files are stored.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_config_path*] # [*ganesha_config_path*]
# (optional) Path to main Ganesha config file. # (optional) Path to main Ganesha config file.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_service_name*] # [*ganesha_service_name*]
# (optional) Name of the ganesha nfs service. # (optional) Name of the ganesha nfs service.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_db_path*] # [*ganesha_db_path*]
# (optional) Location of Ganesha database file (Ganesha module only). # (optional) Location of Ganesha database file (Ganesha module only).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_export_dir*] # [*ganesha_export_dir*]
# (optional) Path to directory containing Ganesha export configuration. # (optional) Path to directory containing Ganesha export configuration.
# (Ganesha module only.) # (Ganesha module only.)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*ganesha_export_template_dir*] # [*ganesha_export_template_dir*]
# (optional) Path to directory containing Ganesha export block templates. # (optional) Path to directory containing Ganesha export block templates.
# (Ganesha module only.) # (Ganesha module only.)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class manila::ganesha ( class manila::ganesha (
$ganesha_config_dir = $::os_service_default, $ganesha_config_dir = $facts['os_service_default'],
$ganesha_config_path = $::os_service_default, $ganesha_config_path = $facts['os_service_default'],
$ganesha_service_name = $::os_service_default, $ganesha_service_name = $facts['os_service_default'],
$ganesha_db_path = $::os_service_default, $ganesha_db_path = $facts['os_service_default'],
$ganesha_export_dir = $::os_service_default, $ganesha_export_dir = $facts['os_service_default'],
$ganesha_export_template_dir = $::os_service_default, $ganesha_export_template_dir = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps

16
manifests/healthcheck.pp
View File

@ -6,28 +6,28 @@
# #
# [*detailed*] # [*detailed*]
# (Optional) Show more detailed information as part of the response. # (Optional) Show more detailed information as part of the response.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*backends*] # [*backends*]
# (Optional) Additional backends that can perform health checks and report # (Optional) Additional backends that can perform health checks and report
# that information back as part of a request. # that information back as part of a request.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*disable_by_file_path*] # [*disable_by_file_path*]
# (Optional) Check the presence of a file to determine if an application # (Optional) Check the presence of a file to determine if an application
# is running on a port. # is running on a port.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*disable_by_file_paths*] # [*disable_by_file_paths*]
# (Optional) Check the presence of a file to determine if an application # (Optional) Check the presence of a file to determine if an application
# is running on a port. Expects a "port:path" list of strings. # is running on a port. Expects a "port:path" list of strings.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class manila::healthcheck ( class manila::healthcheck (
$detailed = $::os_service_default, $detailed = $facts['os_service_default'],
$backends = $::os_service_default, $backends = $facts['os_service_default'],
$disable_by_file_path = $::os_service_default, $disable_by_file_path = $facts['os_service_default'],
$disable_by_file_paths = $::os_service_default, $disable_by_file_paths = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps

44
manifests/image/glance.pp
View File

@ -6,15 +6,15 @@
# #
# [*api_microversion*] # [*api_microversion*]
# (optional) Version of Glance API to be used # (optional) Version of Glance API to be used
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*insecure*] # [*insecure*]
# (optional) Verify HTTPS connections # (optional) Verify HTTPS connections
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_url*] # [*auth_url*]
# (optional) Authentication URL # (optional) Authentication URL
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_type*] # [*auth_type*]
# (optional) Authentication type to load # (optional) Authentication type to load
@ -23,15 +23,15 @@
# [*cafile*] # [*cafile*]
# (optional) Path to PEM encoded Certificate Authority to use when verifying # (optional) Path to PEM encoded Certificate Authority to use when verifying
# HTTPS connections. # HTTPS connections.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*certfile*] # [*certfile*]
# (optional) Path to PEM encoded client certificate cert file. # (optional) Path to PEM encoded client certificate cert file.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*keyfile*] # [*keyfile*]
# (optional) Path to PEM encoded client certificate key file. # (optional) Path to PEM encoded client certificate key file.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*user_domain_name*] # [*user_domain_name*]
# (optional) User's domain name # (optional) User's domain name
@ -47,16 +47,16 @@
# #
# [*system_scope*] # [*system_scope*]
# (optional) Scope for system operations. # (optional) Scope for system operations.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (optional) Region name for connecting to cinder # (optional) Region name for connecting to cinder
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*endpoint_type*] # [*endpoint_type*]
# (optional) The type of cinder endpoint to use when # (optional) The type of cinder endpoint to use when
# looking up in the keystone catalog. # looking up in the keystone catalog.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*username*] # [*username*]
# (optional) Username # (optional) Username
@ -64,24 +64,24 @@
# #
# [*password*] # [*password*]
# (optional) User's password # (optional) User's password
# Defaults to $::os_service_default, # Defaults to $facts['os_service_default'],
# #
class manila::image::glance ( class manila::image::glance (
$api_microversion = $::os_service_default, $api_microversion = $facts['os_service_default'],
$insecure = $::os_service_default, $insecure = $facts['os_service_default'],
$auth_url = $::os_service_default, $auth_url = $facts['os_service_default'],
$auth_type = 'password', $auth_type = 'password',
$cafile = $::os_service_default, $cafile = $facts['os_service_default'],
$certfile = $::os_service_default, $certfile = $facts['os_service_default'],
$keyfile = $::os_service_default, $keyfile = $facts['os_service_default'],
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',
$project_name = 'services', $project_name = 'services',
$system_scope = $::os_service_default, $system_scope = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$username = 'glance', $username = 'glance',
$password = $::os_service_default, $password = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps
@ -90,8 +90,8 @@ class manila::image::glance (
$project_name_real = $project_name $project_name_real = $project_name
$project_domain_name_real = $project_domain_name $project_domain_name_real = $project_domain_name
} else { } else {
$project_name_real = $::os_service_default $project_name_real = $facts['os_service_default']
$project_domain_name_real = $::os_service_default $project_domain_name_real = $facts['os_service_default']
} }
manila_config { manila_config {

108
manifests/init.pp
View File

@ -10,15 +10,15 @@
# (optional) A URL representing the messaging driver to use and its full # (optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form: # configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host # transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rpc_response_timeout*] # [*rpc_response_timeout*]
# (Optional) Seconds to wait for a response from a call. # (Optional) Seconds to wait for a response from a call.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*control_exchange*] # [*control_exchange*]
# (Optional) The default exchange under which topics are scope. # (Optional) The default exchange under which topics are scope.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*package_ensure*] # [*package_ensure*]
# (Optional) Ensure state for package. # (Optional) Ensure state for package.
@ -29,12 +29,12 @@
# notifications and its full configuration. Transport URLs # notifications and its full configuration. Transport URLs
# take the form: # take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host # transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topics to publish to when using the RPC notification driver. # (optional) AMQP topics to publish to when using the RPC notification driver.
# (list value) # (list value)
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*notification_driver*] # [*notification_driver*]
# (optional) Driver or drivers to handle sending notifications. # (optional) Driver or drivers to handle sending notifications.
@ -42,39 +42,39 @@
# #
# [*rabbit_ha_queues*] # [*rabbit_ha_queues*]
# (optional) Use HA queues in RabbitMQ (x-ha-policy: all). # (optional) Use HA queues in RabbitMQ (x-ha-policy: all).
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*rabbit_use_ssl*] # [*rabbit_use_ssl*]
# (Optional) Connect over SSL for RabbitMQ. # (Optional) Connect over SSL for RabbitMQ.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*kombu_ssl_ca_certs*] # [*kombu_ssl_ca_certs*]
# (optional) SSL certification authority file (valid only if SSL enabled). # (optional) SSL certification authority file (valid only if SSL enabled).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_ssl_certfile*] # [*kombu_ssl_certfile*]
# (optional) SSL cert file (valid only if SSL enabled). # (optional) SSL cert file (valid only if SSL enabled).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_ssl_keyfile*] # [*kombu_ssl_keyfile*]
# (optional) SSL key file (valid only if SSL enabled). # (optional) SSL key file (valid only if SSL enabled).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_ssl_version*] # [*kombu_ssl_version*]
# (optional) SSL version to use (valid only if SSL enabled). # (optional) SSL version to use (valid only if SSL enabled).
# Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be # Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be
# available on some distributions. # available on some distributions.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_failover_strategy*] # [*kombu_failover_strategy*]
# (Optional) Determines how the next RabbitMQ node is chosen in case the one # (Optional) Determines how the next RabbitMQ node is chosen in case the one
# we are currently connected to becomes unavailable. Takes effect only if # we are currently connected to becomes unavailable. Takes effect only if
# more than one RabbitMQ node is provided in config. (string value) # more than one RabbitMQ node is provided in config. (string value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*amqp_durable_queues*] # [*amqp_durable_queues*]
# (optional) Use durable queues in amqp. # (optional) Use durable queues in amqp.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*use_ssl*] # [*use_ssl*]
# (optional) Enable SSL on the API server # (optional) Enable SSL on the API server
@ -133,39 +133,39 @@
# #
# [*amqp_ssl_ca_file*] # [*amqp_ssl_ca_file*]
# (optional) CA certificate PEM file to verify server certificate # (optional) CA certificate PEM file to verify server certificate
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*amqp_ssl_cert_file*] # [*amqp_ssl_cert_file*]
# (optional) Identifying certificate PEM file to present to clients # (optional) Identifying certificate PEM file to present to clients
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*amqp_ssl_key_file*] # [*amqp_ssl_key_file*]
# (optional) Private key PEM file used to sign cert_file certificate # (optional) Private key PEM file used to sign cert_file certificate
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*amqp_ssl_key_password*] # [*amqp_ssl_key_password*]
# (optional) Password for decrypting ssl_key_file (if encrypted) # (optional) Password for decrypting ssl_key_file (if encrypted)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*amqp_sasl_mechanisms*] # [*amqp_sasl_mechanisms*]
# (Optional) Space separated list of acceptable SASL mechanisms # (Optional) Space separated list of acceptable SASL mechanisms
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_sasl_config_dir*] # [*amqp_sasl_config_dir*]
# (Optional) Path to directory that contains the SASL configuration # (Optional) Path to directory that contains the SASL configuration
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_sasl_config_name*] # [*amqp_sasl_config_name*]
# (Optional) Name of configuration file (without .conf suffix) # (Optional) Name of configuration file (without .conf suffix)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_username*] # [*amqp_username*]
# (Optional) User name for message broker authentication # (Optional) User name for message broker authentication
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*amqp_password*] # [*amqp_password*]
# (Optional) Password for message broker authentication # (Optional) Password for message broker authentication
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*purge_config*] # [*purge_config*]
# (optional) Whether to set only the specified config options # (optional) Whether to set only the specified config options
@ -175,7 +175,7 @@
# [*host*] # [*host*]
# (optional) Name of this node. This can be an opaque identifier. It is # (optional) Name of this node. This can be an opaque identifier. It is
# not necessarily a host name, FQDN, or IP address. # not necessarily a host name, FQDN, or IP address.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rabbit_heartbeat_in_pthread*] # [*rabbit_heartbeat_in_pthread*]
# (Optional) EXPERIMENTAL: Run the health check heartbeat thread # (Optional) EXPERIMENTAL: Run the health check heartbeat thread
@ -185,37 +185,37 @@
# example if the parent process have monkey patched the # example if the parent process have monkey patched the
# stdlib by using eventlet/greenlet then the heartbeat # stdlib by using eventlet/greenlet then the heartbeat
# will be run through a green thread. # will be run through a green thread.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*report_interval*] # [*report_interval*]
# (optional) Seconds between nodes reporting state to datastore. # (optional) Seconds between nodes reporting state to datastore.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*periodic_interval*] # [*periodic_interval*]
# (optional) Seconds between running periodic tasks. # (optional) Seconds between running periodic tasks.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*periodic_fuzzy_delay*] # [*periodic_fuzzy_delay*]
# (optional) Range of seconds to randomly delay when starting the periodic # (optional) Range of seconds to randomly delay when starting the periodic
# task scheduler to reduce stampeding. # task scheduler to reduce stampeding.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class manila ( class manila (
$default_transport_url = $::os_service_default, $default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $::os_service_default, $rpc_response_timeout = $facts['os_service_default'],
$control_exchange = $::os_service_default, $control_exchange = $facts['os_service_default'],
$notification_transport_url = $::os_service_default, $notification_transport_url = $facts['os_service_default'],
$notification_driver = 'messaging', $notification_driver = 'messaging',
$notification_topics = $::os_service_default, $notification_topics = $facts['os_service_default'],
$rabbit_ha_queues = $::os_service_default, $rabbit_ha_queues = $facts['os_service_default'],
$rabbit_use_ssl = $::os_service_default, $rabbit_use_ssl = $facts['os_service_default'],
$kombu_ssl_ca_certs = $::os_service_default, $kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $::os_service_default, $kombu_ssl_certfile = $facts['os_service_default'],
$kombu_ssl_keyfile = $::os_service_default, $kombu_ssl_keyfile = $facts['os_service_default'],
$kombu_ssl_version = $::os_service_default, $kombu_ssl_version = $facts['os_service_default'],
$kombu_failover_strategy = $::os_service_default, $kombu_failover_strategy = $facts['os_service_default'],
$amqp_durable_queues = $::os_service_default, $amqp_durable_queues = $facts['os_service_default'],
$rabbit_heartbeat_in_pthread = $::os_service_default, $rabbit_heartbeat_in_pthread = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
$use_ssl = false, $use_ssl = false,
$ca_file = false, $ca_file = false,
@ -232,20 +232,20 @@ class manila (
$amqp_container_name = 'guest', $amqp_container_name = 'guest',
$amqp_idle_timeout = '0', $amqp_idle_timeout = '0',
$amqp_trace = false, $amqp_trace = false,
$amqp_ssl_ca_file = $::os_service_default, $amqp_ssl_ca_file = $facts['os_service_default'],
$amqp_ssl_cert_file = $::os_service_default, $amqp_ssl_cert_file = $facts['os_service_default'],
$amqp_ssl_key_file = $::os_service_default, $amqp_ssl_key_file = $facts['os_service_default'],
$amqp_ssl_key_password = $::os_service_default, $amqp_ssl_key_password = $facts['os_service_default'],
$amqp_sasl_mechanisms = $::os_service_default, $amqp_sasl_mechanisms = $facts['os_service_default'],
$amqp_sasl_config_dir = $::os_service_default, $amqp_sasl_config_dir = $facts['os_service_default'],
$amqp_sasl_config_name = $::os_service_default, $amqp_sasl_config_name = $facts['os_service_default'],
$amqp_username = $::os_service_default, $amqp_username = $facts['os_service_default'],
$amqp_password = $::os_service_default, $amqp_password = $facts['os_service_default'],
$purge_config = false, $purge_config = false,
$host = $::os_service_default, $host = $facts['os_service_default'],
$report_interval = $::os_service_default, $report_interval = $facts['os_service_default'],
$periodic_interval = $::os_service_default, $periodic_interval = $facts['os_service_default'],
$periodic_fuzzy_delay = $::os_service_default, $periodic_fuzzy_delay = $facts['os_service_default'],
) inherits manila::params { ) inherits manila::params {
include manila::deps include manila::deps

116
manifests/keystone/authtoken.pp
View File

@ -6,7 +6,7 @@
# #
# [*password*] # [*password*]
# (Optional) Password to create for the service user # (Optional) Password to create for the service user
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*username*] # [*username*]
# (Optional) The name of the service user # (Optional) The name of the service user
@ -30,17 +30,17 @@
# #
# [*system_scope*] # [*system_scope*]
# (Optional) Scope for system operations # (Optional) Scope for system operations
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*insecure*] # [*insecure*]
# (Optional) If true, explicitly allow TLS without checking server cert # (Optional) If true, explicitly allow TLS without checking server cert
# against any certificate authorities. WARNING: not recommended. Use with # against any certificate authorities. WARNING: not recommended. Use with
# caution. # caution.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_section*] # [*auth_section*]
# (Optional) Config Section from which to load plugin specific options # (Optional) Config Section from which to load plugin specific options
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*auth_type*] # [*auth_type*]
# (Optional) Authentication type to load # (Optional) Authentication type to load
@ -52,26 +52,26 @@
# #
# [*auth_version*] # [*auth_version*]
# (Optional) API version of the admin Identity API endpoint. # (Optional) API version of the admin Identity API endpoint.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*cache*] # [*cache*]
# (Optional) Env key for the swift cache. # (Optional) Env key for the swift cache.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*cafile*] # [*cafile*]
# (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs # (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs
# connections. # connections.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*certfile*] # [*certfile*]
# (Optional) Required if identity server requires client certificate # (Optional) Required if identity server requires client certificate
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*delay_auth_decision*] # [*delay_auth_decision*]
# (Optional) Do not handle authorization requests within the middleware, but # (Optional) Do not handle authorization requests within the middleware, but
# delegate the authorization decision to downstream WSGI components. Boolean # delegate the authorization decision to downstream WSGI components. Boolean
# value # value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*enforce_token_bind*] # [*enforce_token_bind*]
# (Optional) Used to control the use and type of token binding. Can be set # (Optional) Used to control the use and type of token binding. Can be set
@ -81,57 +81,57 @@
# type is unknown the token will be rejected. "required" any form of token # type is unknown the token will be rejected. "required" any form of token
# binding is needed to be allowed. Finally the name of a binding method that # binding is needed to be allowed. Finally the name of a binding method that
# must be present in tokens. String value. # must be present in tokens. String value.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*http_connect_timeout*] # [*http_connect_timeout*]
# (Optional) Request timeout value for communicating with Identity API # (Optional) Request timeout value for communicating with Identity API
# server. # server.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*http_request_max_retries*] # [*http_request_max_retries*]
# (Optional) How many times are we trying to reconnect when communicating # (Optional) How many times are we trying to reconnect when communicating
# with Identity API Server. Integer value # with Identity API Server. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*include_service_catalog*] # [*include_service_catalog*]
# (Optional) Indicate whether to set the X-Service-Catalog header. If False, # (Optional) Indicate whether to set the X-Service-Catalog header. If False,
# middleware will not ask for service catalog on token validation and will # middleware will not ask for service catalog on token validation and will
# not set the X-Service-Catalog header. Boolean value. # not set the X-Service-Catalog header. Boolean value.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*keyfile*] # [*keyfile*]
# (Optional) Required if identity server requires client certificate # (Optional) Required if identity server requires client certificate
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_pool_conn_get_timeout*] # [*memcache_pool_conn_get_timeout*]
# (Optional) Number of seconds that an operation will wait to get a memcached # (Optional) Number of seconds that an operation will wait to get a memcached
# client connection from the pool. Integer value # client connection from the pool. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_pool_dead_retry*] # [*memcache_pool_dead_retry*]
# (Optional) Number of seconds memcached server is considered dead before it # (Optional) Number of seconds memcached server is considered dead before it
# is tried again. Integer value # is tried again. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_pool_maxsize*] # [*memcache_pool_maxsize*]
# (Optional) Maximum total number of open connections to every memcached # (Optional) Maximum total number of open connections to every memcached
# server. Integer value # server. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_pool_socket_timeout*] # [*memcache_pool_socket_timeout*]
# (Optional) Number of seconds a connection to memcached is held unused in # (Optional) Number of seconds a connection to memcached is held unused in
# the pool before it is closed. Integer value # the pool before it is closed. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_pool_unused_timeout*] # [*memcache_pool_unused_timeout*]
# (Optional) Number of seconds a connection to memcached is held unused in # (Optional) Number of seconds a connection to memcached is held unused in
# the pool before it is closed. Integer value # the pool before it is closed. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_secret_key*] # [*memcache_secret_key*]
# (Optional, mandatory if memcache_security_strategy is defined) This string # (Optional, mandatory if memcache_security_strategy is defined) This string
# is used for key derivation. # is used for key derivation.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_security_strategy*] # [*memcache_security_strategy*]
# (Optional) If defined, indicate whether token data should be authenticated # (Optional) If defined, indicate whether token data should be authenticated
@ -139,17 +139,17 @@
# HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the # HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the
# cache. If the value is not one of these options or empty, auth_token will # cache. If the value is not one of these options or empty, auth_token will
# raise an exception on initialization. # raise an exception on initialization.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcache_use_advanced_pool*] # [*memcache_use_advanced_pool*]
# (Optional) Use the advanced (eventlet safe) memcached client pool. The # (Optional) Use the advanced (eventlet safe) memcached client pool. The
# advanced pool will only work under python 2.x Boolean value # advanced pool will only work under python 2.x Boolean value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*memcached_servers*] # [*memcached_servers*]
# (Optional) Optionally specify a list of memcached server(s) to use for # (Optional) Optionally specify a list of memcached server(s) to use for
# caching. If left undefined, tokens will instead be cached in-process. # caching. If left undefined, tokens will instead be cached in-process.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*manage_memcache_package*] # [*manage_memcache_package*]
# (Optional) Whether to install the python-memcache package. # (Optional) Whether to install the python-memcache package.
@ -157,13 +157,13 @@
# #
# [*region_name*] # [*region_name*]
# (Optional) The region in which the identity server can be found. # (Optional) The region in which the identity server can be found.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*token_cache_time*] # [*token_cache_time*]
# (Optional) In order to prevent excessive effort spent validating tokens, # (Optional) In order to prevent excessive effort spent validating tokens,
# the middleware caches previously-seen tokens for a configurable duration # the middleware caches previously-seen tokens for a configurable duration
# (in seconds). Set to -1 to disable caching completely. Integer value # (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*service_token_roles*] # [*service_token_roles*]
# (Optional) A choice of roles that must be present in a service token. # (Optional) A choice of roles that must be present in a service token.
@ -173,66 +173,66 @@
# here are applied as an ANY check so any role in this list # here are applied as an ANY check so any role in this list
# must be present. For backwards compatibility reasons this # must be present. For backwards compatibility reasons this
# currently only affects the allow_expired check. (list value) # currently only affects the allow_expired check. (list value)
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*service_token_roles_required*] # [*service_token_roles_required*]
# (optional) backwards compatibility to ensure that the service tokens are # (optional) backwards compatibility to ensure that the service tokens are
# compared against a list of possible roles for validity # compared against a list of possible roles for validity
# true/false # true/false
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*service_type*] # [*service_type*]
# (Optional) The name or type of the service as it appears in the service # (Optional) The name or type of the service as it appears in the service
# catalog. This is used to validate tokens that have restricted access rules. # catalog. This is used to validate tokens that have restricted access rules.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*interface*] # [*interface*]
# (Optional) Interface to use for the Identity API endpoint. Valid values are # (Optional) Interface to use for the Identity API endpoint. Valid values are
# "public", "internal" or "admin". # "public", "internal" or "admin".
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*params*] # [*params*]
# (Optional) Hash of additional parameters to pass through to the keystone # (Optional) Hash of additional parameters to pass through to the keystone
# authtoken class. Values set here override the individual parameters above. # authtoken class. Values set here override the individual parameters above.
# #
class manila::keystone::authtoken( class manila::keystone::authtoken(
$password = $::os_service_default, $password = $facts['os_service_default'],
$username = 'manila', $username = 'manila',
$auth_url = 'http://localhost:5000', $auth_url = 'http://localhost:5000',
$project_name = 'services', $project_name = 'services',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',
$system_scope = $::os_service_default, $system_scope = $facts['os_service_default'],
$insecure = $::os_service_default, $insecure = $facts['os_service_default'],
$auth_section = $::os_service_default, $auth_section = $facts['os_service_default'],
$auth_type = 'password', $auth_type = 'password',
$www_authenticate_uri = 'http://localhost:5000', $www_authenticate_uri = 'http://localhost:5000',
$auth_version = $::os_service_default, $auth_version = $facts['os_service_default'],
$cache = $::os_service_default, $cache = $facts['os_service_default'],
$cafile = $::os_service_default, $cafile = $facts['os_service_default'],
$certfile = $::os_service_default, $certfile = $facts['os_service_default'],
$delay_auth_decision = $::os_service_default, $delay_auth_decision = $facts['os_service_default'],
$enforce_token_bind = $::os_service_default, $enforce_token_bind = $facts['os_service_default'],
$http_connect_timeout = $::os_service_default, $http_connect_timeout = $facts['os_service_default'],
$http_request_max_retries = $::os_service_default, $http_request_max_retries = $facts['os_service_default'],
$include_service_catalog = $::os_service_default, $include_service_catalog = $facts['os_service_default'],
$keyfile = $::os_service_default, $keyfile = $facts['os_service_default'],
$memcache_pool_conn_get_timeout = $::os_service_default, $memcache_pool_conn_get_timeout = $facts['os_service_default'],
$memcache_pool_dead_retry = $::os_service_default, $memcache_pool_dead_retry = $facts['os_service_default'],
$memcache_pool_maxsize = $::os_service_default, $memcache_pool_maxsize = $facts['os_service_default'],
$memcache_pool_socket_timeout = $::os_service_default, $memcache_pool_socket_timeout = $facts['os_service_default'],
$memcache_pool_unused_timeout = $::os_service_default, $memcache_pool_unused_timeout = $facts['os_service_default'],
$memcache_secret_key = $::os_service_default, $memcache_secret_key = $facts['os_service_default'],
$memcache_security_strategy = $::os_service_default, $memcache_security_strategy = $facts['os_service_default'],
$memcache_use_advanced_pool = $::os_service_default, $memcache_use_advanced_pool = $facts['os_service_default'],
$memcached_servers = $::os_service_default, $memcached_servers = $facts['os_service_default'],
$manage_memcache_package = false, $manage_memcache_package = false,
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
$token_cache_time = $::os_service_default, $token_cache_time = $facts['os_service_default'],
$service_token_roles = $::os_service_default, $service_token_roles = $facts['os_service_default'],
$service_token_roles_required = $::os_service_default, $service_token_roles_required = $facts['os_service_default'],
$service_type = $::os_service_default, $service_type = $facts['os_service_default'],
$interface = $::os_service_default, $interface = $facts['os_service_default'],
$params = {} $params = {}
) { ) {

78
manifests/logging.pp
View File

@ -6,71 +6,71 @@
# #
# [*debug*] # [*debug*]
# (Optional) Should the daemons log debug messages # (Optional) Should the daemons log debug messages
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*use_syslog*] # [*use_syslog*]
# (Optional) Use syslog for logging. # (Optional) Use syslog for logging.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*use_json*] # [*use_json*]
# (Optional) Use json for logging. # (Optional) Use json for logging.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*use_journal*] # [*use_journal*]
# (Optional) Use journal for logging. # (Optional) Use journal for logging.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*use_stderr*] # [*use_stderr*]
# (Optional) Use stderr for logging # (Optional) Use stderr for logging
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*log_facility*] # [*log_facility*]
# (Optional) Syslog facility to receive log lines. # (Optional) Syslog facility to receive log lines.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*log_dir*] # [*log_dir*]
# (Optional) Directory where logs should be stored. # (Optional) Directory where logs should be stored.
# If set to $::os_service_default, it will not log to any directory. # If set to $facts['os_service_default'], it will not log to any directory.
# Defaults to '/var/log/manila' # Defaults to '/var/log/manila'
# #
# [*log_file*] # [*log_file*]
# (Optional) File where logs should be stored. # (Optional) File where logs should be stored.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*watch_log_file*] # [*watch_log_file*]
# (Optional) Uses logging handler designed to watch file system (boolean value). # (Optional) Uses logging handler designed to watch file system (boolean value).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*logging_context_format_string*] # [*logging_context_format_string*]
# (Optional) Format string to use for log messages with context. # (Optional) Format string to use for log messages with context.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ # Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\
# [%(request_id)s %(user_identity)s] %(instance)s%(message)s' # [%(request_id)s %(user_identity)s] %(instance)s%(message)s'
# #
# [*logging_default_format_string*] # [*logging_default_format_string*]
# (Optional) Format string to use for log messages without context. # (Optional) Format string to use for log messages without context.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ # Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\
# [-] %(instance)s%(message)s' # [-] %(instance)s%(message)s'
# #
# [*logging_debug_format_suffix*] # [*logging_debug_format_suffix*]
# (Optional) Formatted data to append to log format when level is DEBUG. # (Optional) Formatted data to append to log format when level is DEBUG.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: '%(funcName)s %(pathname)s:%(lineno)d' # Example: '%(funcName)s %(pathname)s:%(lineno)d'
# #
# [*logging_exception_prefix*] # [*logging_exception_prefix*]
# (Optional) Prefix each line of exception output with this format. # (Optional) Prefix each line of exception output with this format.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s' # Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s'
# #
# [*log_config_append*] # [*log_config_append*]
# (Optional) The name of an additional logging configuration file. # (Optional) The name of an additional logging configuration file.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# See https://docs.python.org/2/howto/logging.html # See https://docs.python.org/2/howto/logging.html
# #
# [*default_log_levels*] # [*default_log_levels*]
# (Optional) Hash of logger (keys) and level (values) pairs. # (Optional) Hash of logger (keys) and level (values) pairs.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: # Example:
# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', # { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', # 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
@ -78,50 +78,50 @@
# #
# [*publish_errors*] # [*publish_errors*]
# (Optional) Publish error events (boolean value). # (Optional) Publish error events (boolean value).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*fatal_deprecations*] # [*fatal_deprecations*]
# (Optional) Make deprecations fatal (boolean value) # (Optional) Make deprecations fatal (boolean value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*instance_format*] # [*instance_format*]
# (Optional) If an instance is passed with the log message, format it # (Optional) If an instance is passed with the log message, format it
# like this (string value). # like this (string value).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: '[instance: %(uuid)s] ' # Example: '[instance: %(uuid)s] '
# #
# [*instance_uuid_format*] # [*instance_uuid_format*]
# (Optional) If an instance UUID is passed with the log message, format # (Optional) If an instance UUID is passed with the log message, format
# it like this (string value). # it like this (string value).
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: instance_uuid_format='[instance: %(uuid)s] ' # Example: instance_uuid_format='[instance: %(uuid)s] '
# #
# [*log_date_format*] # [*log_date_format*]
# (Optional) Format string for %%(asctime)s in log records. # (Optional) Format string for %%(asctime)s in log records.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: 'Y-%m-%d %H:%M:%S' # Example: 'Y-%m-%d %H:%M:%S'
# #
class manila::logging( class manila::logging(
$use_syslog = $::os_service_default, $use_syslog = $facts['os_service_default'],
$use_json = $::os_service_default, $use_json = $facts['os_service_default'],
$use_journal = $::os_service_default, $use_journal = $facts['os_service_default'],
$use_stderr = $::os_service_default, $use_stderr = $facts['os_service_default'],
$log_facility = $::os_service_default, $log_facility = $facts['os_service_default'],
$log_dir = '/var/log/manila', $log_dir = '/var/log/manila',
$log_file = $::os_service_default, $log_file = $facts['os_service_default'],
$watch_log_file = $::os_service_default, $watch_log_file = $facts['os_service_default'],
$debug = $::os_service_default, $debug = $facts['os_service_default'],
$logging_context_format_string = $::os_service_default, $logging_context_format_string = $facts['os_service_default'],
$logging_default_format_string = $::os_service_default, $logging_default_format_string = $facts['os_service_default'],
$logging_debug_format_suffix = $::os_service_default, $logging_debug_format_suffix = $facts['os_service_default'],
$logging_exception_prefix = $::os_service_default, $logging_exception_prefix = $facts['os_service_default'],
$log_config_append = $::os_service_default, $log_config_append = $facts['os_service_default'],
$default_log_levels = $::os_service_default, $default_log_levels = $facts['os_service_default'],
$publish_errors = $::os_service_default, $publish_errors = $facts['os_service_default'],
$fatal_deprecations = $::os_service_default, $fatal_deprecations = $facts['os_service_default'],
$instance_format = $::os_service_default, $instance_format = $facts['os_service_default'],
$instance_uuid_format = $::os_service_default, $instance_uuid_format = $facts['os_service_default'],
$log_date_format = $::os_service_default, $log_date_format = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps

44
manifests/network/neutron.pp
View File

@ -6,11 +6,11 @@
# #
# [*insecure*] # [*insecure*]
# (optional) Verify HTTPS connections # (optional) Verify HTTPS connections
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_url*] # [*auth_url*]
# (optional) Authentication URL # (optional) Authentication URL
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_type*] # [*auth_type*]
# (optional) Authentication type to load # (optional) Authentication type to load
@ -19,7 +19,7 @@
# [*cafile*] # [*cafile*]
# (optional) PEM encoded Certificate Authority to use when verifying HTTPS # (optional) PEM encoded Certificate Authority to use when verifying HTTPS
# connections. # connections.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*user_domain_name*] # [*user_domain_name*]
# (optional) User's domain name # (optional) User's domain name
@ -35,20 +35,20 @@
# #
# [*system_scope*] # [*system_scope*]
# (optional) Scope for system operations. # (optional) Scope for system operations.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (optional) Region name for connecting to neutron # (optional) Region name for connecting to neutron
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*timeout*] # [*timeout*]
# (optional) Timeout value for http requests # (optional) Timeout value for http requests
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*endpoint_type*] # [*endpoint_type*]
# (optional) The type of neutron endpoint to use when # (optional) The type of neutron endpoint to use when
# looking up in the keystone catalog. # looking up in the keystone catalog.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*username*] # [*username*]
# (optional) Username # (optional) Username
@ -56,32 +56,32 @@
# #
# [*password*] # [*password*]
# (optional) User's password # (optional) User's password
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*network_plugin_ipv4_enabled*] # [*network_plugin_ipv4_enabled*]
# (optional) Whether to support Ipv4 network resource # (optional) Whether to support Ipv4 network resource
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*network_plugin_ipv6_enabled*] # [*network_plugin_ipv6_enabled*]
# (optional) whether to support IPv6 network resource # (optional) whether to support IPv6 network resource
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class manila::network::neutron ( class manila::network::neutron (
$insecure = $::os_service_default, $insecure = $facts['os_service_default'],
$auth_url = $::os_service_default, $auth_url = $facts['os_service_default'],
$auth_type = 'password', $auth_type = 'password',
$cafile = $::os_service_default, $cafile = $facts['os_service_default'],
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',
$project_name = 'services', $project_name = 'services',
$system_scope = $::os_service_default, $system_scope = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
$timeout = $::os_service_default, $timeout = $facts['os_service_default'],
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$username = 'neutron', $username = 'neutron',
$password = $::os_service_default, $password = $facts['os_service_default'],
$network_plugin_ipv4_enabled = $::os_service_default, $network_plugin_ipv4_enabled = $facts['os_service_default'],
$network_plugin_ipv6_enabled = $::os_service_default, $network_plugin_ipv6_enabled = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps
@ -90,8 +90,8 @@ class manila::network::neutron (
$project_name_real = $project_name $project_name_real = $project_name
$project_domain_name_real = $project_domain_name $project_domain_name_real = $project_domain_name
} else { } else {
$project_name_real = $::os_service_default $project_name_real = $facts['os_service_default']
$project_domain_name_real = $::os_service_default $project_domain_name_real = $facts['os_service_default']
} }
manila_config { manila_config {

8
manifests/network/neutron_single_network.pp
View File

@ -17,17 +17,17 @@
# #
# [*network_plugin_ipv4_enabled*] # [*network_plugin_ipv4_enabled*]
# (optional) Whether to support Ipv4 network resource. # (optional) Whether to support Ipv4 network resource.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*network_plugin_ipv6_enabled*] # [*network_plugin_ipv6_enabled*]
# (optional) whether to support IPv6 network resource. # (optional) whether to support IPv6 network resource.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
define manila::network::neutron_single_network ( define manila::network::neutron_single_network (
$neutron_net_id, $neutron_net_id,
$neutron_subnet_id, $neutron_subnet_id,
$network_plugin_ipv4_enabled = $::os_service_default, $network_plugin_ipv4_enabled = $facts['os_service_default'],
$network_plugin_ipv6_enabled = $::os_service_default, $network_plugin_ipv6_enabled = $facts['os_service_default'],
) { ) {
$neutron_single_plugin_name = 'manila.network.neutron.neutron_network_plugin.NeutronSingleNetworkPlugin' $neutron_single_plugin_name = 'manila.network.neutron.neutron_network_plugin.NeutronSingleNetworkPlugin'

16
manifests/network/standalone.pp
View File

@ -16,7 +16,7 @@
# It will be assigned to share-network and share drivers will be # It will be assigned to share-network and share drivers will be
# able to use this for network interfaces within provisioned # able to use this for network interfaces within provisioned
# share servers. Optional. Example: 1001 # share servers. Optional. Example: 1001
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*standalone_network_plugin_allowed_ip_ranges*] # [*standalone_network_plugin_allowed_ip_ranges*]
# (optional) Can be IP address, range of IP addresses or list of addresses # (optional) Can be IP address, range of IP addresses or list of addresses
@ -25,23 +25,23 @@
# addresses from network can be used. Optional. # addresses from network can be used. Optional.
# Examples: 10.0.0.10 or 10.0.0.10-10.0.0.20 or # Examples: 10.0.0.10 or 10.0.0.10-10.0.0.20 or
# 10.0.0.10-10.0.0.20,10.0.0.30-10.0.0.40,10.0.0.50 # 10.0.0.10-10.0.0.20,10.0.0.30-10.0.0.40,10.0.0.50
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*network_plugin_ipv4_enabled*] # [*network_plugin_ipv4_enabled*]
# (optional) Whether to support Ipv4 network resource # (optional) Whether to support Ipv4 network resource
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*network_plugin_ipv6_enabled*] # [*network_plugin_ipv6_enabled*]
# (optional) whether to support IPv6 network resource # (optional) whether to support IPv6 network resource
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
define manila::network::standalone ( define manila::network::standalone (
$standalone_network_plugin_gateway, $standalone_network_plugin_gateway,
$standalone_network_plugin_mask, $standalone_network_plugin_mask,
$standalone_network_plugin_segmentation_id = $::os_service_default, $standalone_network_plugin_segmentation_id = $facts['os_service_default'],
$standalone_network_plugin_allowed_ip_ranges = $::os_service_default, $standalone_network_plugin_allowed_ip_ranges = $facts['os_service_default'],
$network_plugin_ipv4_enabled = $::os_service_default, $network_plugin_ipv4_enabled = $facts['os_service_default'],
$network_plugin_ipv6_enabled = $::os_service_default, $network_plugin_ipv6_enabled = $facts['os_service_default'],
) { ) {
$standalone_plugin_name = 'manila.network.standalone_network_plugin.StandaloneNetworkPlugin' $standalone_plugin_name = 'manila.network.standalone_network_plugin.StandaloneNetworkPlugin'

4
manifests/params.pp
View File

@ -10,7 +10,7 @@ class manila::params {
$user = 'manila' $user = 'manila'
$group = 'manila' $group = 'manila'
case $::osfamily { case $facts['os']['family'] {
'Debian': { 'Debian': {
$lock_path = '/var/lock/manila' $lock_path = '/var/lock/manila'
$package_name = 'manila-common' $package_name = 'manila-common'
@ -46,7 +46,7 @@ class manila::params {
$nfs_client_package_name = 'nfs-utils' $nfs_client_package_name = 'nfs-utils'
} }
default: { default: {
fail("unsupported osfamily ${::osfamily}, currently Debian and Redhat are the only supported platforms") fail("unsupported osfamily ${facts['os']['family']}, currently Debian and Redhat are the only supported platforms")
} }
} }

16
manifests/policy.pp
View File

@ -6,12 +6,12 @@
# #
# [*enforce_scope*] # [*enforce_scope*]
# (Optional) Whether or not to enforce scope when evaluating policies. # (Optional) Whether or not to enforce scope when evaluating policies.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*enforce_new_defaults*] # [*enforce_new_defaults*]
# (Optional) Whether or not to use old deprecated defaults when evaluating # (Optional) Whether or not to use old deprecated defaults when evaluating
# policies. # policies.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*policies*] # [*policies*]
# (Optional) Set of policies to configure for manila # (Optional) Set of policies to configure for manila
@ -34,11 +34,11 @@
# #
# [*policy_default_rule*] # [*policy_default_rule*]
# (Optional) Default rule. Enforced when a requested rule is not found. # (Optional) Default rule. Enforced when a requested rule is not found.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*policy_dirs*] # [*policy_dirs*]
# (Optional) Path to the manila policy folder # (Optional) Path to the manila policy folder
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*purge_config*] # [*purge_config*]
# (optional) Whether to set only the specified policy rules in the policy # (optional) Whether to set only the specified policy rules in the policy
@ -46,12 +46,12 @@
# Defaults to false. # Defaults to false.
# #
class manila::policy ( class manila::policy (
$enforce_scope = $::os_service_default, $enforce_scope = $facts['os_service_default'],
$enforce_new_defaults = $::os_service_default, $enforce_new_defaults = $facts['os_service_default'],
$policies = {}, $policies = {},
$policy_path = '/etc/manila/policy.yaml', $policy_path = '/etc/manila/policy.yaml',
$policy_default_rule = $::os_service_default, $policy_default_rule = $facts['os_service_default'],
$policy_dirs = $::os_service_default, $policy_dirs = $facts['os_service_default'],
$purge_config = false, $purge_config = false,
) { ) {

42
manifests/quota.pp
View File

@ -6,60 +6,60 @@
# #
# [*shares*] # [*shares*]
# (optional) Number of shares allowed per project. # (optional) Number of shares allowed per project.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*snapshots*] # [*snapshots*]
# (optional) Number of share snapshots allowed per project. # (optional) Number of share snapshots allowed per project.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*gigabytes*] # [*gigabytes*]
# (optional) Number of share gigabytes (snapshots are also included) # (optional) Number of share gigabytes (snapshots are also included)
# allowed per project. Defaults to $::os_service_default. # allowed per project. Defaults to $facts['os_service_default'].
# #
# [*driver*] # [*driver*]
# (optional) Default driver to use for quota checks. # (optional) Default driver to use for quota checks.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*snapshot_gigabytes*] # [*snapshot_gigabytes*]
# (optional) Number of snapshot gigabytes allowed per project. # (optional) Number of snapshot gigabytes allowed per project.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*share_networks*] # [*share_networks*]
# (optional) Number of share-networks allowed per project. # (optional) Number of share-networks allowed per project.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*share_replicas*] # [*share_replicas*]
# (optional) Number of share-replicas allowed per project. # (optional) Number of share-replicas allowed per project.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*replica_gigabytes*] # [*replica_gigabytes*]
# (optional) Number of replica gigabytes allowed per project. # (optional) Number of replica gigabytes allowed per project.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*reservation_expire*] # [*reservation_expire*]
# (optional) Number of seconds until a reservation expires. # (optional) Number of seconds until a reservation expires.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*until_refresh*] # [*until_refresh*]
# (optional) Count of reservations until usage is refreshed. # (optional) Count of reservations until usage is refreshed.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*max_age*] # [*max_age*]
# (optional) Number of seconds between subsequent usage refreshes. # (optional) Number of seconds between subsequent usage refreshes.
# Defaults to $:os_service_default. # Defaults to $:os_service_default.
# #
class manila::quota ( class manila::quota (
$shares = $::os_service_default, $shares = $facts['os_service_default'],
$snapshots = $::os_service_default, $snapshots = $facts['os_service_default'],
$gigabytes = $::os_service_default, $gigabytes = $facts['os_service_default'],
$driver = $::os_service_default, $driver = $facts['os_service_default'],
$snapshot_gigabytes = $::os_service_default, $snapshot_gigabytes = $facts['os_service_default'],
$share_networks = $::os_service_default, $share_networks = $facts['os_service_default'],
$share_replicas = $::os_service_default, $share_replicas = $facts['os_service_default'],
$replica_gigabytes = $::os_service_default, $replica_gigabytes = $facts['os_service_default'],
$reservation_expire = $::os_service_default, $reservation_expire = $facts['os_service_default'],
$until_refresh = $::os_service_default, $until_refresh = $facts['os_service_default'],
$max_age = $::os_service_default, $max_age = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps

10
manifests/scheduler.pp
View File

@ -6,7 +6,7 @@
# #
# [*scheduler_driver*] # [*scheduler_driver*]
# (Optional) Default scheduler driver to use # (Optional) Default scheduler driver to use
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*package_ensure*] # [*package_ensure*]
# (Optional) The state of the scheduler package # (Optional) The state of the scheduler package
@ -21,7 +21,7 @@
# Defaults to true. # Defaults to true.
# #
class manila::scheduler ( class manila::scheduler (
$scheduler_driver = $::os_service_default, $scheduler_driver = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
$enabled = true, $enabled = true,
$manage_service = true $manage_service = true
@ -35,10 +35,10 @@ class manila::scheduler (
'DEFAULT/scheduler_driver': value => $scheduler_driver 'DEFAULT/scheduler_driver': value => $scheduler_driver
} }
} else { } else {
warning('Using a false value for scheduler_driver is deprecated.' warning("Using a false value for scheduler_driver is deprecated. \
+ 'Use $::os_service_default instead.') Use the os_service_default fact instead.")
manila_config { manila_config {
'DEFAULT/scheduler_driver': value => $::os_service_default 'DEFAULT/scheduler_driver': value => $facts['os_service_default']
} }
} }

4
manifests/share/netapp.pp
View File

@ -67,7 +67,7 @@
# [*netapp_root_volume*] # [*netapp_root_volume*]
# (optional) Root volume name. This option only applies when the option # (optional) Root volume name. This option only applies when the option
# driver_handles_share_servers is set to True. # driver_handles_share_servers is set to True.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*netapp_port_name_search_pattern*] # [*netapp_port_name_search_pattern*]
# (optional) Pattern for overriding the selection of network ports on which # (optional) Pattern for overriding the selection of network ports on which
@ -103,7 +103,7 @@ class manila::share::netapp (
$netapp_lif_name_template = 'os_%(net_allocation_id)s', $netapp_lif_name_template = 'os_%(net_allocation_id)s',
$netapp_aggregate_name_search_pattern = '(.*)', $netapp_aggregate_name_search_pattern = '(.*)',
$netapp_root_volume_aggregate = undef, $netapp_root_volume_aggregate = undef,
$netapp_root_volume = $::os_service_default, $netapp_root_volume = $facts['os_service_default'],
$netapp_port_name_search_pattern = '(.*)', $netapp_port_name_search_pattern = '(.*)',
$netapp_trace_flags = undef, $netapp_trace_flags = undef,
) { ) {

40
manifests/volume/cinder.pp
View File

@ -6,11 +6,11 @@
# #
# [*insecure*] # [*insecure*]
# (optional) Verify HTTPS connections # (optional) Verify HTTPS connections
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_url*] # [*auth_url*]
# (optional) Authentication URL # (optional) Authentication URL
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*auth_type*] # [*auth_type*]
# (optional) Authentication type to load # (optional) Authentication type to load
@ -19,7 +19,7 @@
# [*cafile*] # [*cafile*]
# (optional) PEM encoded Certificate Authority to use when verifying HTTPS # (optional) PEM encoded Certificate Authority to use when verifying HTTPS
# connections. # connections.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*user_domain_name*] # [*user_domain_name*]
# (optional) User's domain name # (optional) User's domain name
@ -35,16 +35,16 @@
# #
# [*system_scope*] # [*system_scope*]
# (optional) Scope for system operations. # (optional) Scope for system operations.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (optional) Region name for connecting to cinder # (optional) Region name for connecting to cinder
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*endpoint_type*] # [*endpoint_type*]
# (optional) The type of cinder endpoint to use when # (optional) The type of cinder endpoint to use when
# looking up in the keystone catalog. # looking up in the keystone catalog.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*username*] # [*username*]
# (optional) Username # (optional) Username
@ -52,32 +52,32 @@
# #
# [*password*] # [*password*]
# (optional) User's password # (optional) User's password
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*http_retries*] # [*http_retries*]
# (optional) Number of cinderclient retries on failed http calls. # (optional) Number of cinderclient retries on failed http calls.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*cross_az_attach*] # [*cross_az_attach*]
# (optional) Allow attach between instance and volume in different # (optional) Allow attach between instance and volume in different
# availability zones. # availability zones.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class manila::volume::cinder ( class manila::volume::cinder (
$insecure = $::os_service_default, $insecure = $facts['os_service_default'],
$auth_url = $::os_service_default, $auth_url = $facts['os_service_default'],
$auth_type = 'password', $auth_type = 'password',
$cafile = $::os_service_default, $cafile = $facts['os_service_default'],
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',
$project_name = 'services', $project_name = 'services',
$system_scope = $::os_service_default, $system_scope = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$username = 'cinder', $username = 'cinder',
$password = $::os_service_default, $password = $facts['os_service_default'],
$http_retries = $::os_service_default, $http_retries = $facts['os_service_default'],
$cross_az_attach = $::os_service_default, $cross_az_attach = $facts['os_service_default'],
) { ) {
include manila::deps include manila::deps
@ -86,8 +86,8 @@ class manila::volume::cinder (
$project_name_real = $project_name $project_name_real = $project_name
$project_domain_name_real = $project_domain_name $project_domain_name_real = $project_domain_name
} else { } else {
$project_name_real = $::os_service_default $project_name_real = $facts['os_service_default']
$project_domain_name_real = $::os_service_default $project_domain_name_real = $facts['os_service_default']
} }
manila_config { manila_config {

8
manifests/wsgi/apache.pp
View File

@ -25,7 +25,7 @@
# #
# [*servername*] # [*servername*]
# The servername for the virtualhost. # The servername for the virtualhost.
# Optional. Defaults to $::fqdn # Optional. Defaults to $facts['networking']['fqdn']
# #
# [*port*] # [*port*]
# The port. # The port.
@ -45,7 +45,7 @@
# #
# [*workers*] # [*workers*]
# Number of WSGI workers to spawn. # Number of WSGI workers to spawn.
# Optional. Defaults to $::os_workers # Optional. Defaults to $facts['os_workers']
# #
# [*priority*] # [*priority*]
# (optional) The priority for the vhost. # (optional) The priority for the vhost.
@ -130,12 +130,12 @@
# #
class manila::wsgi::apache ( class manila::wsgi::apache (
$servername = $::fqdn, $servername = $facts['networking']['fqdn'],
$port = 8786, $port = 8786,
$bind_host = undef, $bind_host = undef,
$path = '/', $path = '/',
$ssl = false, $ssl = false,
$workers = $::os_workers, $workers = $facts['os_workers'],
$ssl_cert = undef, $ssl_cert = undef,
$ssl_key = undef, $ssl_key = undef,
$ssl_chain = undef, $ssl_chain = undef,

6
manifests/wsgi/uwsgi.pp
View File

@ -11,7 +11,7 @@
# #
# [*processes*] # [*processes*]
# (Optional) Number of processes. # (Optional) Number of processes.
# Defaults to $::os_workers. # Defaults to $facts['os_workers'].
# #
# [*threads*] # [*threads*]
# (Optional) Number of threads. # (Optional) Number of threads.
@ -22,14 +22,14 @@
# Defaults to 100 # Defaults to 100
# #
class manila::wsgi::uwsgi ( class manila::wsgi::uwsgi (
$processes = $::os_workers, $processes = $facts['os_workers'],
$threads = 32, $threads = 32,
$listen_queue_size = 100, $listen_queue_size = 100,
){ ){
include manila::deps include manila::deps
if $::operatingsystem != 'Debian'{ if $facts['os']['name'] != 'Debian'{
warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.') warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
} }

2
spec/classes/manila_api_spec.rb
View File

@ -215,7 +215,7 @@ describe 'manila::api' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it_behaves_like 'manila::api' it_behaves_like 'manila::api'
end end

2
spec/classes/manila_backends_spec.rb
View File

@ -67,7 +67,7 @@ describe 'manila::backends' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it_behaves_like 'manila backends' it_behaves_like 'manila backends'
end end

2
spec/classes/manila_client_spec.rb
View File

@ -25,7 +25,7 @@ describe 'manila::client' do
end end
let :platform_params do let :platform_params do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :client_package => 'python3-manilaclient' } { :client_package => 'python3-manilaclient' }
when 'RedHat' when 'RedHat'

4
spec/classes/manila_data_spec.rb
View File

@ -83,7 +83,7 @@ describe 'manila::data' do
end end
let :platform_params do let :platform_params do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :data_service => 'manila-data' } { :data_service => 'manila-data' }
when 'RedHat' when 'RedHat'
@ -92,7 +92,7 @@ describe 'manila::data' do
end end
it_behaves_like 'manila::data' it_behaves_like 'manila::data'
it_behaves_like "manila::data on #{facts[:osfamily]}" it_behaves_like "manila::data on #{facts[:os]['family']}"
end end
end end

2
spec/classes/manila_db_mysql_spec.rb
View File

@ -60,7 +60,7 @@ describe 'manila::db::mysql' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it_behaves_like 'manila::db::mysql' it_behaves_like 'manila::db::mysql'
end end

2
spec/classes/manila_db_spec.rb
View File

@ -54,7 +54,7 @@ describe 'manila::db' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it_behaves_like 'manila::db' it_behaves_like 'manila::db'

5
spec/classes/manila_db_sync_spec.rb
View File

@ -31,10 +31,7 @@ describe 'manila::db::sync' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge(OSDefaults.get_facts({ facts.merge(OSDefaults.get_facts())
:os_workers => 8,
:concat_basedir => '/var/lib/puppet/concat'
}))
end end
it_configures 'manila-dbsync' it_configures 'manila-dbsync'

4
spec/classes/manila_ganesha_spec.rb
View File

@ -50,10 +50,10 @@ describe 'manila::ganesha' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it_configures 'manila::ganesha' it_configures 'manila::ganesha'
if facts[:osfamily] == 'RedHat' if facts[:os]['family'] == 'RedHat'
it_configures 'manila::ganesha on RedHat' it_configures 'manila::ganesha on RedHat'
end end
end end

4
spec/classes/manila_init_spec.rb
View File

@ -230,10 +230,10 @@ describe 'manila' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
let(:platform_params) do let(:platform_params) do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ {
:lock_path => '/var/lock/manila' :lock_path => '/var/lock/manila'

2
spec/classes/manila_network_neutron_spec.rb
View File

@ -77,7 +77,7 @@ describe 'manila::network::neutron' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it_behaves_like 'manila::neutron' it_behaves_like 'manila::neutron'

2
spec/classes/manila_params_spec.rb
View File

@ -7,7 +7,7 @@ describe 'manila::params' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it 'should compile' do it 'should compile' do
subject subject

2
spec/classes/manila_quota_spec.rb
View File

@ -76,7 +76,7 @@ describe 'manila::quota' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it_behaves_like 'manila::quota' it_behaves_like 'manila::quota'
end end

4
spec/classes/manila_scheduler_spec.rb
View File

@ -81,7 +81,7 @@ describe 'manila::scheduler' do
end end
let :platform_params do let :platform_params do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :scheduler_service => 'manila-scheduler' } { :scheduler_service => 'manila-scheduler' }
when 'RedHat' when 'RedHat'
@ -90,7 +90,7 @@ describe 'manila::scheduler' do
end end
it_behaves_like 'manila::scheduler' it_behaves_like 'manila::scheduler'
it_behaves_like "manila::scheduler on #{facts[:osfamily]}" it_behaves_like "manila::scheduler on #{facts[:os]['family']}"
end end
end end

2
spec/classes/manila_share_generic_spec.rb
View File

@ -40,7 +40,7 @@ describe 'manila::share::generic' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it_behaves_like 'manila::share::generic' it_behaves_like 'manila::share::generic'
end end

2
spec/classes/manila_share_glusterfs_spec.rb
View File

@ -26,7 +26,7 @@ describe 'manila::share::glusterfs' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it_behaves_like 'glusterfs share driver' it_behaves_like 'glusterfs share driver'
end end

2
spec/classes/manila_share_netapp_spec.rb
View File

@ -53,7 +53,7 @@ describe 'manila::share::netapp' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
context 'with default parameters' do context 'with default parameters' do
before do before do

4
spec/classes/manila_share_spec.rb
View File

@ -32,11 +32,11 @@ describe 'manila::share' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
let :platform_params do let :platform_params do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :package_name => 'manila-share' } { :package_name => 'manila-share' }
when 'RedHat' when 'RedHat'

6
spec/classes/manila_wsgi_apache_spec.rb
View File

@ -10,7 +10,7 @@ describe 'manila::wsgi::apache' do
:group => 'manila', :group => 'manila',
:path => '/', :path => '/',
:priority => 10, :priority => 10,
:servername => facts[:fqdn], :servername => 'foo.example.com',
:ssl => false, :ssl => false,
:threads => 1, :threads => 1,
:user => 'manila', :user => 'manila',
@ -148,13 +148,11 @@ describe 'manila::wsgi::apache' do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ facts.merge!(OSDefaults.get_facts({
:os_workers => 42, :os_workers => 42,
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'some.host.tld',
})) }))
end end
let(:platform_params) do let(:platform_params) do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ {
:wsgi_script_path => '/usr/lib/cgi-bin/manila', :wsgi_script_path => '/usr/lib/cgi-bin/manila',

2
spec/defines/manila_backend_cephfs_spec.rb
View File

@ -73,7 +73,7 @@ describe 'manila::backend::cephfs' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge(OSDefaults.get_facts({ :osfamily => "#{os}" })) facts.merge(OSDefaults.get_facts())
end end
it_configures 'cephfs driver' it_configures 'cephfs driver'

2
spec/defines/manila_backend_ganesha_spec.rb
View File

@ -58,7 +58,7 @@ describe 'manila::backend::ganesha' do
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) facts.merge!(OSDefaults.get_facts())
end end
it_configures 'manila::backend::ganesha' it_configures 'manila::backend::ganesha'
end end

2
spec/defines/manila_backend_glusternative_spec.rb
View File

@ -47,7 +47,7 @@ describe 'manila::backend::glusternative' do
end end
let :platform_params do let :platform_params do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ {
:gluster_client_package_name => 'glusterfs-client', :gluster_client_package_name => 'glusterfs-client',

2
spec/defines/manila_backend_glusternfs_spec.rb
View File

@ -49,7 +49,7 @@ describe 'manila::backend::glusternfs' do
end end
let :platform_params do let :platform_params do
case facts[:osfamily] case facts[:os]['family']
when 'Debian' when 'Debian'
{ {
:gluster_client_package_name => 'glusterfs-client', :gluster_client_package_name => 'glusterfs-client',