openstack/puppet-gnocchi
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: Ia9ab733a7fc5cbb5b23659ff7cbfd3b2b7d2fb18
This commit is contained in:
Takashi Kajinami 2023-03-02 10:55:20 +09:00
parent ecd6b5a669
commit 37049a867d
22 changed files with 191 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/api.pp
View File

@ -13,7 +13,7 @@
# [*max_limit*]
# (optional) The maximum number of items returned in a
# single response from a collection resource.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) ensure state for package.
@ -39,34 +39,34 @@
#
# [*paste_config*]
# (Optional) Path to API paste configuration.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*operation_timeout*]
# (Optional) Number of seconds before timeout when attempting to do some
# operations.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*enable_proxy_headers_parsing*]
# (Optional) Enable paste middleware to handle SSL requests through
# HTTPProxyToWSGI middleware.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_request_body_size*]
# (Optional) Set max request body size
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class gnocchi::api (
$manage_service = true,
$enabled = true,
$package_ensure = 'present',
$max_limit = $::os_service_default,
$max_limit = $facts['os_service_default'],
$service_name = $::gnocchi::params::api_service_name,
$sync_db = false,
$auth_strategy = 'keystone',
$paste_config = $::os_service_default,
$operation_timeout = $::os_service_default,
$enable_proxy_headers_parsing = $::os_service_default,
$max_request_body_size = $::os_service_default,
$paste_config = $facts['os_service_default'],
$operation_timeout = $facts['os_service_default'],
$enable_proxy_headers_parsing = $facts['os_service_default'],
$max_request_body_size = $facts['os_service_default'],
) inherits gnocchi::params {
include gnocchi::deps

24
manifests/cors.pp
View File

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

16
manifests/healthcheck.pp
View File

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

4
manifests/init.pp
View File

@ -10,7 +10,7 @@
#
# [*coordination_url*]
# (optional) The url to use for distributed group membership coordination.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@ -19,7 +19,7 @@
#
class gnocchi (
$package_ensure = 'present',
$coordination_url = $::os_service_default,
$coordination_url = $facts['os_service_default'],
$purge_config = false,
) inherits gnocchi::params {

116
manifests/keystone/authtoken.pp
View File

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

34
manifests/logging.pp
View File

@ -6,52 +6,52 @@
#
# [*debug*]
# (Optional) Should the daemons log debug messages
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*use_syslog*]
# (Optional) Use syslog for logging.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*use_json*]
# (Optional) Use json for logging.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*use_journal*]
# (Optional) Use journal for logging.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*use_stderr*]
# (Optional) Use stderr for logging
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*log_facility*]
# (Optional) Syslog facility to receive log lines.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*log_dir*]
# (Optional) Directory where logs should be stored.
# If set to boolean false or the $::os_service_default, it will not log to
# If set to boolean false or the $facts['os_service_default'], it will not log to
# any directory.
# Defaults to '/var/log/gnocchi'
#
# [*log_file*]
# (Optional) File where logs should be stored.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*watch_log_file*]
# (Optional) Uses logging handler designed to watch file system (boolean value).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class gnocchi::logging(
$use_syslog = $::os_service_default,
$use_json = $::os_service_default,
$use_journal = $::os_service_default,
$use_stderr = $::os_service_default,
$log_facility = $::os_service_default,
$use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'],
$use_journal = $facts['os_service_default'],
$use_stderr = $facts['os_service_default'],
$log_facility = $facts['os_service_default'],
$log_dir = '/var/log/gnocchi',
$log_file = $::os_service_default,
$watch_log_file = $::os_service_default,
$debug = $::os_service_default,
$log_file = $facts['os_service_default'],
$watch_log_file = $facts['os_service_default'],
$debug = $facts['os_service_default'],
) {
include gnocchi::deps

24
manifests/metricd.pp
View File

@ -12,28 +12,28 @@
#
# [*workers*]
# (optional) the number of workers.
# Defaults to $::os_workers
# Defaults to $facts['os_workers']
#
# [*metric_processing_delay*]
# (optional) Delay between processing metrics
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*greedy*]
# (optional) Allow to bypass metric_processing_delay if metricd is noticed
# that messages are ready to be processed.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*metric_reporting_delay*]
# (optional) How many seconds to wait between metric ingestion reporting.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*metric_cleanup_delay*]
# (optional) How many seconds to wait between cleaning of expired data.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*processing_replicas*]
# (optional) Number of workers tht share a task.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*manage_service*]
# (optional) Whether the service should be managed by Puppet.
@ -42,12 +42,12 @@
class gnocchi::metricd (
$manage_service = true,
$enabled = true,
$workers = $::os_workers,
$metric_processing_delay = $::os_service_default,
$greedy = $::os_service_default,
$metric_reporting_delay = $::os_service_default,
$metric_cleanup_delay = $::os_service_default,
$processing_replicas = $::os_service_default,
$workers = $facts['os_workers'],
$metric_processing_delay = $facts['os_service_default'],
$greedy = $facts['os_service_default'],
$metric_reporting_delay = $facts['os_service_default'],
$metric_cleanup_delay = $facts['os_service_default'],
$processing_replicas = $facts['os_service_default'],
$package_ensure = 'present',
) inherits gnocchi::params {

6
manifests/params.pp
View File

@ -19,7 +19,7 @@ class gnocchi::params {
$gnocchi_wsgi_script_source = '/usr/bin/gnocchi-api'
$boto3_package_name = 'python3-boto3'
case $::osfamily {
case $facts['os']['family'] {
'RedHat': {
$sqlite_package_name = undef
$indexer_package_name = 'openstack-gnocchi-indexer-sqlalchemy'
@ -33,8 +33,8 @@ class gnocchi::params {
$pymysql_package_name = 'python3-pymysql'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem")
fail("Unsupported osfamily: ${facts['os']['family']}")
}
} # Case $::osfamily
} # Case $facts['os']['family']
}

16
manifests/policy.pp
View File

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

20
manifests/statsd.pp
View File

@ -7,23 +7,23 @@
#
# [*host*]
# (optional) The listen IP for statsd.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*port*]
# (optional) The port for statsd.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*flush_delay*]
# (optional) Delay between flushes.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*archive_policy_name*]
# (optional) Archive policy name to use when creating metrics.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*creator*]
# (required) Creator value to use to identify statsd in Gnocchi.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*enabled*]
# (optional) Should the service be enabled.
@ -39,11 +39,11 @@
#
class gnocchi::statsd (
$resource_id,
$host = $::os_service_default,
$port = $::os_service_default,
$flush_delay = $::os_service_default,
$archive_policy_name = $::os_service_default,
$creator = $::os_service_default,
$host = $facts['os_service_default'],
$port = $facts['os_service_default'],
$flush_delay = $facts['os_service_default'],
$archive_policy_name = $facts['os_service_default'],
$creator = $facts['os_service_default'],
$manage_service = true,
$enabled = true,
$package_ensure = 'present',

12
manifests/storage/ceph.pp
View File

@ -26,11 +26,11 @@
#
# [*ceph_keyring*]
# (optional) Ceph keyring path.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ceph_secret*]
# (optional) Ceph secret.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ceph_pool*]
# (optional) Ceph pool name to use.
@ -38,7 +38,7 @@
#
# [*ceph_timeout*]
# (optional) Ceph connection timeout in seconds.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ceph_conffile*]
# (optional) Ceph configuration file.
@ -54,10 +54,10 @@
#
class gnocchi::storage::ceph(
$ceph_username,
$ceph_keyring = $::os_service_default,
$ceph_secret = $::os_service_default,
$ceph_keyring = $facts['os_service_default'],
$ceph_secret = $facts['os_service_default'],
$ceph_pool = 'gnocchi',
$ceph_timeout = $::os_service_default,
$ceph_timeout = $facts['os_service_default'],
$ceph_conffile = '/etc/ceph/ceph.conf',
$manage_rados = true,
$package_ensure = 'present',

10
manifests/storage/s3.pp
View File

@ -7,11 +7,11 @@
#
# [*s3_endpoint_url*]
# (optional) 'S3 endpoint url.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*s3_region_name*]
# (optional) S3 Region name.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*s3_access_key_id*]
# (optional) S3 storage access key id.
@ -34,11 +34,11 @@
# Defaults to 'present'
#
class gnocchi::storage::s3(
$s3_endpoint_url = $::os_service_default,
$s3_region_name = $::os_service_default,
$s3_endpoint_url = $facts['os_service_default'],
$s3_region_name = $facts['os_service_default'],
$s3_access_key_id = undef,
$s3_secret_access_key = undef,
$s3_bucket_prefix = $::os_service_default,
$s3_bucket_prefix = $facts['os_service_default'],
$manage_boto3 = true,
$package_ensure = 'present',
) {

44
manifests/storage/swift.pp
View File

@ -23,62 +23,62 @@
#
# [*swift_auth_version*]
# (optional) 'Swift authentication version to user.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_authurl*]
# (optional) Swift auth URL.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_user*]
# (optional) Swift user.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_key*]
# (optional) Swift key.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_project_name*]
# (optional) Swift tenant name, only used if swift_auth_version is '2' or
# '3'.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_user_domain_name*]
# (optional) Swift user domain name.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_project_domain_name*]
# (optional) Swift project domain name.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_region*]
# (optional) Swift region.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_endpoint_type*]
# (optional) Swift endpoint type. Defines the keystone endpoint type
# (publicURL, internalURL or adminURL).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_service_type*]
# (optional) A string giving the service type of the swift service to use.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_timeout*]
# (optional) Connection timeout in seconds.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class gnocchi::storage::swift(
$swift_auth_version = $::os_service_default,
$swift_authurl = $::os_service_default,
$swift_user = $::os_service_default,
$swift_key = $::os_service_default,
$swift_project_name = $::os_service_default,
$swift_user_domain_name = $::os_service_default,
$swift_project_domain_name = $::os_service_default,
$swift_region = $::os_service_default,
$swift_endpoint_type = $::os_service_default,
$swift_service_type = $::os_service_default,
$swift_timeout = $::os_service_default,
$swift_auth_version = $facts['os_service_default'],
$swift_authurl = $facts['os_service_default'],
$swift_user = $facts['os_service_default'],
$swift_key = $facts['os_service_default'],
$swift_project_name = $facts['os_service_default'],
$swift_user_domain_name = $facts['os_service_default'],
$swift_project_domain_name = $facts['os_service_default'],
$swift_region = $facts['os_service_default'],
$swift_endpoint_type = $facts['os_service_default'],
$swift_service_type = $facts['os_service_default'],
$swift_timeout = $facts['os_service_default'],
) {
include gnocchi::deps

8
manifests/wsgi/apache.pp
View File

@ -26,7 +26,7 @@
#
# [*servername*]
# (Optional) The servername for the virtualhost.
# Defaults to $::fqdn
# Defaults to $facts['networking']['fqdn']
#
# [*port*]
# (Optional) The port.
@ -46,7 +46,7 @@
#
# [*workers*]
# (Optional) Number of WSGI workers to spawn.
# Defaults to $::os_workers
# Defaults to $facts['os_workers']
#
# [*priority*]
# (Optional) The priority for the vhost.
@ -132,12 +132,12 @@
# class { 'gnocchi::wsgi::apache': }
#
class gnocchi::wsgi::apache (
$servername = $::fqdn,
$servername = $facts['networking']['fqdn'],
$port = 8041,
$bind_host = undef,
$path = '/',
$ssl = false,
$workers = $::os_workers,
$workers = $facts['os_workers'],
$ssl_cert = undef,
$ssl_key = undef,
$ssl_chain = undef,

6
manifests/wsgi/uwsgi.pp
View File

@ -11,7 +11,7 @@
#
# [*processes*]
# (Optional) Number of processes.
# Defaults to $::os_workers.
# Defaults to $facts['os_workers'].
#
# [*threads*]
# (Optional) Number of threads.
@ -22,14 +22,14 @@
# Defaults to 100
#
class gnocchi::wsgi::uwsgi (
$processes = $::os_workers,
$processes = $facts['os_workers'],
$threads = 32,
$listen_queue_size = 100,
){
include gnocchi::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.')
}

6
spec/classes/gnocchi_api_spec.rb
View File

@ -198,13 +198,11 @@ describe 'gnocchi::api' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts({
:concat_basedir => '/var/lib/puppet/concat',
}))
facts.merge!(OSDefaults.get_facts())
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
package_name = 'gnocchi-api'
when 'RedHat'

2
spec/classes/gnocchi_client_spec.rb
View File

@ -23,7 +23,7 @@ describe 'gnocchi::client' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :client_package_name => 'python3-gnocchiclient' }
when 'RedHat'

4
spec/classes/gnocchi_db_spec.rb
View File

@ -111,7 +111,7 @@ describe 'gnocchi::db' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{
:pymysql_package_name => 'python3-pymysql',
@ -120,7 +120,7 @@ describe 'gnocchi::db' do
end
it_behaves_like 'gnocchi::db'
it_behaves_like "gnocchi::db on #{facts[:osfamily]}"
it_behaves_like "gnocchi::db on #{facts[:os]['family']}"
end
end
end

5
spec/classes/gnocchi_db_sync_spec.rb
View File

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

2
spec/classes/gnocchi_init_spec.rb
View File

@ -67,7 +67,7 @@ describe 'gnocchi' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :gnocchi_common_package => 'gnocchi-common' }
when 'RedHat'

2
spec/classes/gnocchi_storage_s3_spec.rb
View File

@ -66,7 +66,7 @@ describe 'gnocchi::storage::s3' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :boto3_package_name => 'python3-boto3' }
when 'RedHat'

8
spec/classes/gnocchi_wsgi_apache_spec.rb
View File

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