openstack/puppet-watcher
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: Ib4f33d08f9415b4a8533ec6b9b0e6d7637f4e289
This commit is contained in:
Takashi Kajinami 2023-03-02 12:46:00 +09:00
parent a786c751e8
commit f6ab996e63
26 changed files with 362 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/api.pp
View File

@ -5,7 +5,7 @@
# === Parameters: # === Parameters:
# #
# All options are optional unless specified otherwise. # All options are optional unless specified otherwise.
# All options defaults to $::os_service_default and # All options defaults to $facts['os_service_default'] and
# the default values from the service are used. # the default values from the service are used.
# #
# === Watcher configuration # === Watcher configuration
@ -24,27 +24,27 @@
# #
# [*port*] # [*port*]
# (Optional) The port on which the watcher API will listen. # (Optional) The port on which the watcher API will listen.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*max_limit*] # [*max_limit*]
# (Optional)The maximum number of items returned in a single response from a # (Optional)The maximum number of items returned in a single response from a
# collection resource. # collection resource.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*bind_host*] # [*bind_host*]
# (Optional) Listen IP for the watcher API server. # (Optional) Listen IP for the watcher API server.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*workers*] # [*workers*]
# (Optional) Number of worker processors to for the Watcher API service. # (Optional) Number of worker processors to for the Watcher API service.
# Defaults to $::os_workers. # Defaults to $facts['os_workers'].
# #
# [*enable_ssl_api*] # [*enable_ssl_api*]
# (Optional) Enable the integrated stand-alone API to service requests via HTTPS instead # (Optional) Enable the integrated stand-alone API to service requests via HTTPS instead
# of HTTP. If there is a front-end service performing HTTPS offloading from the # of HTTP. If there is a front-end service performing HTTPS offloading from the
# service, this option should be False; note, you will want to change public # service, this option should be False; note, you will want to change public
# API endpoint to represent SSL termination URL with 'public_endpoint' option. # API endpoint to represent SSL termination URL with 'public_endpoint' option.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
# [*service_name*] # [*service_name*]
# (optional) Name of the service that will be providing the # (optional) Name of the service that will be providing the
@ -75,11 +75,11 @@ class watcher::api (
$package_ensure = 'present', $package_ensure = 'present',
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
$port = $::os_service_default, $port = $facts['os_service_default'],
$max_limit = $::os_service_default, $max_limit = $facts['os_service_default'],
$bind_host = $::os_service_default, $bind_host = $facts['os_service_default'],
$workers = $::os_workers, $workers = $facts['os_workers'],
$enable_ssl_api = $::os_service_default, $enable_ssl_api = $facts['os_service_default'],
$service_name = $::watcher::params::api_service_name, $service_name = $::watcher::params::api_service_name,
$create_db_schema = false, $create_db_schema = false,
$upgrade_db = false, $upgrade_db = false,

20
manifests/applier.pp
View File

@ -16,35 +16,35 @@
# #
# [*applier_workers*] # [*applier_workers*]
# (Optional) Number of workers for watcher applier service. # (Optional) Number of workers for watcher applier service.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*applier_conductor_topic*] # [*applier_conductor_topic*]
# (Optional) The topic name used forcontrol events, this topic used # (Optional) The topic name used forcontrol events, this topic used
# for rpc call # for rpc call
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*applier_status_topic*] # [*applier_status_topic*]
# (Optional) The topic name used for status events, this topic is used # (Optional) The topic name used for status events, this topic is used
# so as to notifythe others components of the system # so as to notifythe others components of the system
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*applier_publisher_id*] # [*applier_publisher_id*]
# (Optional) The identifier used by watcher module on the message broker # (Optional) The identifier used by watcher module on the message broker
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*applier_workflow_engine*] # [*applier_workflow_engine*]
# (Optional) Select the engine to use to execute the workflow # (Optional) Select the engine to use to execute the workflow
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
class watcher::applier ( class watcher::applier (
$package_ensure = 'present', $package_ensure = 'present',
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
$applier_workers = $::os_service_default, $applier_workers = $facts['os_service_default'],
$applier_conductor_topic = $::os_service_default, $applier_conductor_topic = $facts['os_service_default'],
$applier_status_topic = $::os_service_default, $applier_status_topic = $facts['os_service_default'],
$applier_publisher_id = $::os_service_default, $applier_publisher_id = $facts['os_service_default'],
$applier_workflow_engine = $::os_service_default, $applier_workflow_engine = $facts['os_service_default'],
) { ) {
include watcher::params include watcher::params

112
manifests/cache.pp
View File

@ -9,99 +9,99 @@
# the cache region. This should not need to be changed unless there # the cache region. This should not need to be changed unless there
# is another dogpile.cache region with the same configuration name. # is another dogpile.cache region with the same configuration name.
# (string value) # (string value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*expiration_time*] # [*expiration_time*]
# (Optional) Default TTL, in seconds, for any cached item in the # (Optional) Default TTL, in seconds, for any cached item in the
# dogpile.cache region. This applies to any cached method that # dogpile.cache region. This applies to any cached method that
# doesn't have an explicit cache expiration time defined for it. # doesn't have an explicit cache expiration time defined for it.
# (integer value) # (integer value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*backend*] # [*backend*]
# (Optional) Dogpile.cache backend module. It is recommended that # (Optional) Dogpile.cache backend module. It is recommended that
# Memcache with pooling (oslo_cache.memcache_pool) or Redis # Memcache with pooling (oslo_cache.memcache_pool) or Redis
# (dogpile.cache.redis) be used in production deployments. (string value) # (dogpile.cache.redis) be used in production deployments. (string value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*backend_argument*] # [*backend_argument*]
# (Optional) Arguments supplied to the backend module. Specify this option # (Optional) Arguments supplied to the backend module. Specify this option
# once per argument to be passed to the dogpile.cache backend. # once per argument to be passed to the dogpile.cache backend.
# Example format: "<argname>:<value>". (list value) # Example format: "<argname>:<value>". (list value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*proxies*] # [*proxies*]
# (Optional) Proxy classes to import that will affect the way the # (Optional) Proxy classes to import that will affect the way the
# dogpile.cache backend functions. See the dogpile.cache documentation on # dogpile.cache backend functions. See the dogpile.cache documentation on
# changing-backend-behavior. (list value) # changing-backend-behavior. (list value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*enabled*] # [*enabled*]
# (Optional) Global toggle for caching. (boolean value) # (Optional) Global toggle for caching. (boolean value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*debug_cache_backend*] # [*debug_cache_backend*]
# (Optional) Extra debugging from the cache backend (cache keys, # (Optional) Extra debugging from the cache backend (cache keys,
# get/set/delete/etc calls). This is only really useful if you need # get/set/delete/etc calls). This is only really useful if you need
# to see the specific cache-backend get/set/delete calls with the keys/values. # to see the specific cache-backend get/set/delete calls with the keys/values.
# Typically this should be left set to false. (boolean value) # Typically this should be left set to false. (boolean value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*memcache_servers*] # [*memcache_servers*]
# (Optional) Memcache servers in the format of "host:port". # (Optional) Memcache servers in the format of "host:port".
# (dogpile.cache.memcache and oslo_cache.memcache_pool backends only). # (dogpile.cache.memcache and oslo_cache.memcache_pool backends only).
# (list value) # (list value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*memcache_dead_retry*] # [*memcache_dead_retry*]
# (Optional) Number of seconds memcached server is considered dead before # (Optional) Number of seconds memcached server is considered dead before
# it is tried again. (dogpile.cache.memcache and oslo_cache.memcache_pool # it is tried again. (dogpile.cache.memcache and oslo_cache.memcache_pool
# backends only). (integer value) # backends only). (integer value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*memcache_socket_timeout*] # [*memcache_socket_timeout*]
# (Optional) Timeout in seconds for every call to a server. # (Optional) Timeout in seconds for every call to a server.
# (dogpile.cache.memcache and oslo_cache.memcache_pool backends only). # (dogpile.cache.memcache and oslo_cache.memcache_pool backends only).
# (floating point value) # (floating point value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*enable_socket_keepalive*] # [*enable_socket_keepalive*]
# (Optional) Global toggle for the socket keepalive of dogpile's # (Optional) Global toggle for the socket keepalive of dogpile's
# pymemcache backend # pymemcache backend
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*socket_keepalive_idle*] # [*socket_keepalive_idle*]
# (Optional) The time (in seconds) the connection needs to remain idle # (Optional) The time (in seconds) the connection needs to remain idle
# before TCP starts sending keepalive probes. Should be a positive integer # before TCP starts sending keepalive probes. Should be a positive integer
# most greater than zero. # most greater than zero.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*socket_keepalive_interval*] # [*socket_keepalive_interval*]
# (Optional) The time (in seconds) between individual keepalive probes. # (Optional) The time (in seconds) between individual keepalive probes.
# Should be a positive integer most greater than zero. # Should be a positive integer most greater than zero.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*socket_keepalive_count*] # [*socket_keepalive_count*]
# (Optional) The maximum number of keepalive probes TCP should send before # (Optional) The maximum number of keepalive probes TCP should send before
# dropping the connection. Should be a positive integer most greater than # dropping the connection. Should be a positive integer most greater than
# zero. # zero.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*memcache_pool_maxsize*] # [*memcache_pool_maxsize*]
# (Optional) Max total number of open connections to every memcached server. # (Optional) Max total number of open connections to every memcached server.
# (oslo_cache.memcache_pool backend only). (integer value) # (oslo_cache.memcache_pool backend only). (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 # (Optional) Number of seconds a connection to memcached is held unused
# in the pool before it is closed. (oslo_cache.memcache_pool backend only) # in the pool before it is closed. (oslo_cache.memcache_pool backend only)
# (integer value) # (integer value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*memcache_pool_connection_get_timeout*] # [*memcache_pool_connection_get_timeout*]
# (Optional) Number of seconds that an operation will wait to get a memcache # (Optional) Number of seconds that an operation will wait to get a memcache
# client connection. (integer value) # client connection. (integer value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*manage_backend_package*] # [*manage_backend_package*]
# (Optional) Whether to install the backend package for the cache. # (Optional) Whether to install the backend package for the cache.
@ -110,13 +110,13 @@
# [*tls_enabled*] # [*tls_enabled*]
# (Optional) Global toggle for TLS usage when comunicating with # (Optional) Global toggle for TLS usage when comunicating with
# the caching servers. # the caching servers.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*tls_cafile*] # [*tls_cafile*]
# (Optional) Path to a file of concatenated CA certificates in PEM # (Optional) Path to a file of concatenated CA certificates in PEM
# format necessary to establish the caching server's authenticity. # format necessary to establish the caching server's authenticity.
# If tls_enabled is False, this option is ignored. # If tls_enabled is False, this option is ignored.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*tls_certfile*] # [*tls_certfile*]
# (Optional) Path to a single file in PEM format containing the # (Optional) Path to a single file in PEM format containing the
@ -124,83 +124,83 @@
# needed to establish the certificate's authenticity. This file # needed to establish the certificate's authenticity. This file
# is only required when client side authentication is necessary. # is only required when client side authentication is necessary.
# If tls_enabled is False, this option is ignored. # If tls_enabled is False, this option is ignored.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*tls_keyfile*] # [*tls_keyfile*]
# (Optional) Path to a single file containing the client's private # (Optional) Path to a single file containing the client's private
# key in. Otherwhise the private key will be taken from the file # key in. Otherwhise the private key will be taken from the file
# specified in tls_certfile. If tls_enabled is False, this option # specified in tls_certfile. If tls_enabled is False, this option
# is ignored. # is ignored.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*tls_allowed_ciphers*] # [*tls_allowed_ciphers*]
# (Optional) Set the available ciphers for sockets created with # (Optional) Set the available ciphers for sockets created with
# the TLS context. It should be a string in the OpenSSL cipher # the TLS context. It should be a string in the OpenSSL cipher
# list format. If not specified, all OpenSSL enabled ciphers will # list format. If not specified, all OpenSSL enabled ciphers will
# be available. # be available.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*enable_retry_client*] # [*enable_retry_client*]
# (Optional) Enable retry client mechanisms to handle failure. # (Optional) Enable retry client mechanisms to handle failure.
# Those mechanisms can be used to wrap all kind of pymemcache # Those mechanisms can be used to wrap all kind of pymemcache
# clients. The wrapper allows you to define how many attempts # clients. The wrapper allows you to define how many attempts
# to make and how long to wait between attemots. # to make and how long to wait between attemots.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*retry_attempts*] # [*retry_attempts*]
# (Optional) Number of times to attempt an action before failing. # (Optional) Number of times to attempt an action before failing.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*retry_delay*] # [*retry_delay*]
# (Optional) Number of seconds to sleep between each attempt. # (Optional) Number of seconds to sleep between each attempt.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*hashclient_retry_attempts*] # [*hashclient_retry_attempts*]
# (Optional) Amount of times a client should be tried # (Optional) Amount of times a client should be tried
# before it is marked dead and removed from the pool in # before it is marked dead and removed from the pool in
# the HashClient's internal mechanisms. # the HashClient's internal mechanisms.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*hashclient_retry_delay*] # [*hashclient_retry_delay*]
# (Optional) Time in seconds that should pass between # (Optional) Time in seconds that should pass between
# retry attempts in the HashClient's internal mechanisms. # retry attempts in the HashClient's internal mechanisms.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
# [*dead_timeout*] # [*dead_timeout*]
# (Optional) Time in seconds before attempting to add a node # (Optional) Time in seconds before attempting to add a node
# back in the pool in the HashClient's internal mechanisms. # back in the pool in the HashClient's internal mechanisms.
# Default to $::os_service_default # Default to $facts['os_service_default']
# #
class watcher::cache ( class watcher::cache (
$config_prefix = $::os_service_default, $config_prefix = $facts['os_service_default'],
$expiration_time = $::os_service_default, $expiration_time = $facts['os_service_default'],
$backend = $::os_service_default, $backend = $facts['os_service_default'],
$backend_argument = $::os_service_default, $backend_argument = $facts['os_service_default'],
$proxies = $::os_service_default, $proxies = $facts['os_service_default'],
$enabled = $::os_service_default, $enabled = $facts['os_service_default'],
$debug_cache_backend = $::os_service_default, $debug_cache_backend = $facts['os_service_default'],
$memcache_servers = $::os_service_default, $memcache_servers = $facts['os_service_default'],
$memcache_dead_retry = $::os_service_default, $memcache_dead_retry = $facts['os_service_default'],
$memcache_socket_timeout = $::os_service_default, $memcache_socket_timeout = $facts['os_service_default'],
$enable_socket_keepalive = $::os_service_default, $enable_socket_keepalive = $facts['os_service_default'],
$socket_keepalive_idle = $::os_service_default, $socket_keepalive_idle = $facts['os_service_default'],
$socket_keepalive_interval = $::os_service_default, $socket_keepalive_interval = $facts['os_service_default'],
$socket_keepalive_count = $::os_service_default, $socket_keepalive_count = $facts['os_service_default'],
$memcache_pool_maxsize = $::os_service_default, $memcache_pool_maxsize = $facts['os_service_default'],
$memcache_pool_unused_timeout = $::os_service_default, $memcache_pool_unused_timeout = $facts['os_service_default'],
$memcache_pool_connection_get_timeout = $::os_service_default, $memcache_pool_connection_get_timeout = $facts['os_service_default'],
$manage_backend_package = true, $manage_backend_package = true,
$tls_enabled = $::os_service_default, $tls_enabled = $facts['os_service_default'],
$tls_cafile = $::os_service_default, $tls_cafile = $facts['os_service_default'],
$tls_certfile = $::os_service_default, $tls_certfile = $facts['os_service_default'],
$tls_keyfile = $::os_service_default, $tls_keyfile = $facts['os_service_default'],
$tls_allowed_ciphers = $::os_service_default, $tls_allowed_ciphers = $facts['os_service_default'],
$enable_retry_client = $::os_service_default, $enable_retry_client = $facts['os_service_default'],
$retry_attempts = $::os_service_default, $retry_attempts = $facts['os_service_default'],
$retry_delay = $::os_service_default, $retry_delay = $facts['os_service_default'],
$hashclient_retry_attempts = $::os_service_default, $hashclient_retry_attempts = $facts['os_service_default'],
$hashclient_retry_delay = $::os_service_default, $hashclient_retry_delay = $facts['os_service_default'],
$dead_timeout = $::os_service_default, $dead_timeout = $facts['os_service_default'],
) { ) {
include watcher::deps include watcher::deps

12
manifests/cinder_client.pp
View File

@ -6,21 +6,21 @@
# #
# [*api_version*] # [*api_version*]
# (Optional) Version of Cinder API to use in cinderclient. # (Optional) Version of Cinder API to use in cinderclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*endpoint_type*] # [*endpoint_type*]
# (Optional) Type of endpoint to use in cinderclient. # (Optional) Type of endpoint to use in cinderclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (Optional) Region in Identify service catalog to use for communication # (Optional) Region in Identify service catalog to use for communication
# with the OpenStack service. # with the OpenStack service.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class watcher::cinder_client ( class watcher::cinder_client (
$api_version = $::os_service_default, $api_version = $facts['os_service_default'],
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
) { ) {
include watcher::deps include watcher::deps

32
manifests/db.pp
View File

@ -10,49 +10,49 @@
# #
# [*database_connection_recycle_time*] # [*database_connection_recycle_time*]
# (Optional) Timeout when db connections should be reaped. # (Optional) Timeout when db connections should be reaped.
# 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']
# #
# [*database_max_retries*] # [*database_max_retries*]
# (Optional) Maximum number of database connection retries during startup. # (Optional) Maximum number of database connection retries during startup.
# Setting -1 implies an infinite retry count. # Setting -1 implies an infinite retry count.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*database_retry_interval*] # [*database_retry_interval*]
# (Optional) Interval between retries of opening a database connection. # (Optional) Interval between retries of opening a database connection.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*database_max_pool_size*] # [*database_max_pool_size*]
# (Optional) Maximum number of SQL connections to keep open in a pool. # (Optional) Maximum number of SQL connections to keep open in a pool.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*database_max_overflow*] # [*database_max_overflow*]
# (Optional) If set, use this value for max_overflow with sqlalchemy. # (Optional) If set, use this value for max_overflow with sqlalchemy.
# Defaults to $::os_service_default # 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']
# #
class watcher::db ( class watcher::db (
$database_connection = 'sqlite:////var/lib/watcher/watcher.sqlite', $database_connection = 'sqlite:////var/lib/watcher/watcher.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_db_max_retries = $::os_service_default, $database_db_max_retries = $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'],
) { ) {
include watcher::deps include watcher::deps

28
manifests/decision_engine.pp
View File

@ -17,35 +17,35 @@
# [*decision_engine_conductor_topic*] # [*decision_engine_conductor_topic*]
# (Optional) The topic name used forcontrol events, this topic used # (Optional) The topic name used forcontrol events, this topic used
# for rpc call # for rpc call
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*decision_engine_status_topic*] # [*decision_engine_status_topic*]
# (Optional) The topic name used for status events, this topic is used # (Optional) The topic name used for status events, this topic is used
# so as to notifythe others components of the system # so as to notifythe others components of the system
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*decision_engine_notification_topics*] # [*decision_engine_notification_topics*]
# (Optional) The topic names from which notification events will be # (Optional) The topic names from which notification events will be
# listened to (list value) # listened to (list value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*decision_engine_publisher_id*] # [*decision_engine_publisher_id*]
# (Optional) The identifier used by watcher module on the message broker # (Optional) The identifier used by watcher module on the message broker
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*decision_engine_workers*] # [*decision_engine_workers*]
# (Optional) The maximum number of threads that can be used to execute # (Optional) The maximum number of threads that can be used to execute
# strategies # strategies
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*planner*] # [*planner*]
# (Optional) The selected planner used to schedule the actions (string value) # (Optional) The selected planner used to schedule the actions (string value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*weights*] # [*weights*]
# (Optional) Hash of weights used to schedule the actions (dict value). # (Optional) Hash of weights used to schedule the actions (dict value).
# The key is an action, value is an order number. # The key is an action, value is an order number.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# Example: # Example:
# { 'change_nova_service_state' => '2', # { 'change_nova_service_state' => '2',
# 'migrate' => '3', 'nop' => '0', 'sleep' => '1' } # 'migrate' => '3', 'nop' => '0', 'sleep' => '1' }
@ -55,13 +55,13 @@ class watcher::decision_engine (
$package_ensure = 'present', $package_ensure = 'present',
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
$decision_engine_conductor_topic = $::os_service_default, $decision_engine_conductor_topic = $facts['os_service_default'],
$decision_engine_status_topic = $::os_service_default, $decision_engine_status_topic = $facts['os_service_default'],
$decision_engine_notification_topics = $::os_service_default, $decision_engine_notification_topics = $facts['os_service_default'],
$decision_engine_publisher_id = $::os_service_default, $decision_engine_publisher_id = $facts['os_service_default'],
$decision_engine_workers = $::os_service_default, $decision_engine_workers = $facts['os_service_default'],
$planner = $::os_service_default, $planner = $facts['os_service_default'],
$weights = $::os_service_default, $weights = $facts['os_service_default'],
) { ) {
include watcher::params include watcher::params

12
manifests/glance_client.pp
View File

@ -6,21 +6,21 @@
# #
# [*api_version*] # [*api_version*]
# (Optional) Version of Glance API to use in glanceclient. # (Optional) Version of Glance API to use in glanceclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*endpoint_type*] # [*endpoint_type*]
# (Optional) Type of endpoint to use in glanceclient. # (Optional) Type of endpoint to use in glanceclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (Optional) Region in Identify service catalog to use for communication # (Optional) Region in Identify service catalog to use for communication
# with the OpenStack service. # with the OpenStack service.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class watcher::glance_client ( class watcher::glance_client (
$api_version = $::os_service_default, $api_version = $facts['os_service_default'],
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
) { ) {
include watcher::deps include watcher::deps

12
manifests/gnocchi_client.pp
View File

@ -6,21 +6,21 @@
# #
# [*api_version*] # [*api_version*]
# (Optional) Version of Gnocchi API to use in gnocchiclient. # (Optional) Version of Gnocchi API to use in gnocchiclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*endpoint_type*] # [*endpoint_type*]
# (Optional) Type of endpoint to use in gnocchiclient. # (Optional) Type of endpoint to use in gnocchiclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (Optional) Region in Identify service catalog to use for communication # (Optional) Region in Identify service catalog to use for communication
# with the OpenStack service. # with the OpenStack service.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class watcher::gnocchi_client ( class watcher::gnocchi_client (
$api_version = $::os_service_default, $api_version = $facts['os_service_default'],
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
) { ) {
include watcher::deps include watcher::deps

160
manifests/init.pp
View File

@ -14,30 +14,30 @@
# #
# [*rabbit_login_method*] # [*rabbit_login_method*]
# (optional) The RabbitMQ login method. (string value) # (optional) The RabbitMQ login method. (string value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rabbit_retry_interval*] # [*rabbit_retry_interval*]
# (Optional) How frequently to retry connecting with RabbitMQ. # (Optional) How frequently to retry connecting with RabbitMQ.
# (integer value) # (integer value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rabbit_retry_backoff*] # [*rabbit_retry_backoff*]
# (Optional) How long to backoff for between retries when connecting # (Optional) How long to backoff for between retries when connecting
# to RabbitMQ. (integer value) # to RabbitMQ. (integer value)
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rabbit_interval_max*] # [*rabbit_interval_max*]
# (Optional) Maximum interval of RabbitMQ connection retries. (integer value) # (Optional) Maximum interval of RabbitMQ connection retries. (integer value)
# 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']
# #
# [*rabbit_heartbeat_rate*] # [*rabbit_heartbeat_rate*]
# (optional) ow often times during the heartbeat_timeout_threshold we # (optional) ow often times during the heartbeat_timeout_threshold we
# check the heartbeat. # check the heartbeat.
# 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
@ -47,12 +47,12 @@
# 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']
# #
# [*rabbit_ha_queues*] # [*rabbit_ha_queues*]
# (optional) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this # (optional) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this
# option, you must wipe the RabbitMQ database. # option, you must wipe the RabbitMQ database.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rabbit_transient_queues_ttl*] # [*rabbit_transient_queues_ttl*]
# (Optional) Positive integer representing duration in seconds for # (Optional) Positive integer representing duration in seconds for
@ -60,148 +60,148 @@
# of the TTL are automatically deleted. # of the TTL are automatically deleted.
# The parameter affects only reply and fanout queues. (integer value) # The parameter affects only reply and fanout queues. (integer value)
# Min to 1 # Min to 1
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*rabbit_heartbeat_timeout_threshold*] # [*rabbit_heartbeat_timeout_threshold*]
# (Optional) Number of seconds after which the Rabbit broker is # (Optional) Number of seconds after which the Rabbit broker is
# considered down if heartbeat's keep-alive fails # considered down if heartbeat's keep-alive fails
# (0 disable the heartbeat). EXPERIMENTAL. (integer value) # (0 disable the heartbeat). EXPERIMENTAL. (integer value)
# 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). Valid values are # (optional) SSL version to use (valid only if SSL enabled). Valid values are
# TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be # TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be
# available on some distributions. # available on some distributions.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_reconnect_delay*] # [*kombu_reconnect_delay*]
# (optional) How long to wait before reconnecting in response to an AMQP # (optional) How long to wait before reconnecting in response to an AMQP
# consumer cancel notification. # consumer cancel notification.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*kombu_missing_consumer_retry_timeout*] # [*kombu_missing_consumer_retry_timeout*]
# (optional)How long to wait a missing client beforce abandoning to send it # (optional)How long to wait a missing client beforce abandoning to send it
# its replies. This value should not be longer than rpc_response_timeout. # its replies. This value should not be longer than rpc_response_timeout.
# 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']
# #
# [*kombu_compression*] # [*kombu_compression*]
# (optional) Possible values are: gzip, bz2. If not set compression will not # (optional) Possible values are: gzip, bz2. If not set compression will not
# be used. This option may notbe available in future versions. EXPERIMENTAL. # be used. This option may notbe available in future versions. EXPERIMENTAL.
# (string value) # (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']
# #
# [*default_transport_url*] # [*default_transport_url*]
# (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. If not set, we fall back to the rpc_backend option # configuration. If not set, we fall back to the rpc_backend option
# and driver specific configuration. # and driver specific configuration.
# 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 scoped. May be # (Optional) The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the transport_url # overridden by an exchange name specified in the transport_url
# option. # option.
# 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']
# #
# [*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_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_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_container_name*] # [*amqp_container_name*]
# (Optional) Name for the AMQP container. # (Optional) Name for the AMQP container.
# 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_server_request_prefix*] # [*amqp_server_request_prefix*]
# (Optional) Address prefix used when sending to a specific server. # (Optional) Address prefix used when sending to a specific server.
# 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_idle_timeout*] # [*amqp_idle_timeout*]
# (Optional) Timeout for inactive connections (in seconds). # (Optional) Timeout for inactive connections (in seconds).
# 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_broadcast_prefix*] # [*amqp_broadcast_prefix*]
# (Optional) Address prefix used when broadcasting to all servers. # (Optional) Address prefix used when broadcasting to all servers.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*amqp_trace*] # [*amqp_trace*]
# (Optional) Debug: dump AMQP frames to stdout. # (Optional) Debug: dump AMQP frames to stdout.
# 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_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_group_request_prefix*] # [*amqp_group_request_prefix*]
# (Optional) Address prefix when sending to any server in group. # (Optional) Address prefix when sending to any server in group.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*notification_transport_url*] # [*notification_transport_url*]
# (optional) A URL representing the messaging driver to use for notifications # (optional) A URL representing the messaging driver to use for notifications
# and its full configuration. Transport URLs take the form: # and its full 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']
# #
# [*notification_driver*] # [*notification_driver*]
# (optional) Driver or drivers to handle sending notifications. # (optional) Driver or drivers to handle sending notifications.
# Value can be a string or a list. # Value can be a string or a list.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
# 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
@ -216,48 +216,48 @@ class watcher (
$purge_config = false, $purge_config = false,
$use_ssl = false, $use_ssl = false,
$package_ensure = 'present', $package_ensure = 'present',
$rabbit_login_method = $::os_service_default, $rabbit_login_method = $facts['os_service_default'],
$rabbit_retry_interval = $::os_service_default, $rabbit_retry_interval = $facts['os_service_default'],
$rabbit_retry_backoff = $::os_service_default, $rabbit_retry_backoff = $facts['os_service_default'],
$rabbit_interval_max = $::os_service_default, $rabbit_interval_max = $facts['os_service_default'],
$rabbit_use_ssl = $::os_service_default, $rabbit_use_ssl = $facts['os_service_default'],
$rabbit_heartbeat_rate = $::os_service_default, $rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_heartbeat_in_pthread = $::os_service_default, $rabbit_heartbeat_in_pthread = $facts['os_service_default'],
$rabbit_ha_queues = $::os_service_default, $rabbit_ha_queues = $facts['os_service_default'],
$rabbit_transient_queues_ttl = $::os_service_default, $rabbit_transient_queues_ttl = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $::os_service_default, $rabbit_heartbeat_timeout_threshold = $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_reconnect_delay = $::os_service_default, $kombu_reconnect_delay = $facts['os_service_default'],
$kombu_missing_consumer_retry_timeout = $::os_service_default, $kombu_missing_consumer_retry_timeout = $facts['os_service_default'],
$kombu_failover_strategy = $::os_service_default, $kombu_failover_strategy = $facts['os_service_default'],
$kombu_compression = $::os_service_default, $kombu_compression = $facts['os_service_default'],
$amqp_durable_queues = $::os_service_default, $amqp_durable_queues = $facts['os_service_default'],
$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'],
# amqp # amqp
$amqp_username = $::os_service_default, $amqp_username = $facts['os_service_default'],
$amqp_password = $::os_service_default, $amqp_password = $facts['os_service_default'],
$amqp_ssl_ca_file = $::os_service_default, $amqp_ssl_ca_file = $facts['os_service_default'],
$amqp_ssl_key_file = $::os_service_default, $amqp_ssl_key_file = $facts['os_service_default'],
$amqp_container_name = $::os_service_default, $amqp_container_name = $facts['os_service_default'],
$amqp_sasl_mechanisms = $::os_service_default, $amqp_sasl_mechanisms = $facts['os_service_default'],
$amqp_server_request_prefix = $::os_service_default, $amqp_server_request_prefix = $facts['os_service_default'],
$amqp_ssl_key_password = $::os_service_default, $amqp_ssl_key_password = $facts['os_service_default'],
$amqp_idle_timeout = $::os_service_default, $amqp_idle_timeout = $facts['os_service_default'],
$amqp_ssl_cert_file = $::os_service_default, $amqp_ssl_cert_file = $facts['os_service_default'],
$amqp_broadcast_prefix = $::os_service_default, $amqp_broadcast_prefix = $facts['os_service_default'],
$amqp_trace = $::os_service_default, $amqp_trace = $facts['os_service_default'],
$amqp_sasl_config_name = $::os_service_default, $amqp_sasl_config_name = $facts['os_service_default'],
$amqp_sasl_config_dir = $::os_service_default, $amqp_sasl_config_dir = $facts['os_service_default'],
$amqp_group_request_prefix = $::os_service_default, $amqp_group_request_prefix = $facts['os_service_default'],
# messaging # messaging
$notification_transport_url = $::os_service_default, $notification_transport_url = $facts['os_service_default'],
$notification_driver = $::os_service_default, $notification_driver = $facts['os_service_default'],
$notification_topics = $::os_service_default, $notification_topics = $facts['os_service_default'],
) { ) {
include openstacklib::openstackclient include openstacklib::openstackclient

12
manifests/ironic_client.pp
View File

@ -6,21 +6,21 @@
# #
# [*api_version*] # [*api_version*]
# (Optional) Version of Ironic API to use in ironicclient. # (Optional) Version of Ironic API to use in ironicclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*endpoint_type*] # [*endpoint_type*]
# (Optional) Type of endpoint to use in ironicclient. # (Optional) Type of endpoint to use in ironicclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (Optional) Region in Identify service catalog to use for communication # (Optional) Region in Identify service catalog to use for communication
# with the OpenStack service. # with the OpenStack service.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class watcher::ironic_client ( class watcher::ironic_client (
$api_version = $::os_service_default, $api_version = $facts['os_service_default'],
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
) { ) {
include watcher::deps include watcher::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,59 +81,59 @@
# 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 # the
# pool before it is closed. Integer value # 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 # the
# pool before it is closed. Integer value # 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
@ -141,17 +141,17 @@
# HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated # 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, # in the cache. If the value is not one of these options or empty,
# auth_token will raise an exception on initialization. # auth_token will 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.
@ -159,13 +159,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.
@ -175,62 +175,62 @@
# 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'].
# #
class watcher::keystone::authtoken ( class watcher::keystone::authtoken (
$password = $::os_service_default, $password = $facts['os_service_default'],
$username = 'watcher', $username = 'watcher',
$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_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'],
$memcache_pool_unused_timeout = $::os_service_default, $memcache_pool_unused_timeout = $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'],
) { ) {
include watcher::deps include watcher::deps

8
manifests/keystone_client.pp
View File

@ -6,16 +6,16 @@
# #
# [*endpoint_type*] # [*endpoint_type*]
# (Optional) Type of endpoint to use in keystoneclient. # (Optional) Type of endpoint to use in keystoneclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (Optional) Region in Identify service catalog to use for communication # (Optional) Region in Identify service catalog to use for communication
# with the OpenStack service. # with the OpenStack service.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class watcher::keystone_client ( class watcher::keystone_client (
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
) { ) {
include watcher::deps include watcher::deps

72
manifests/logging.pp
View File

@ -6,31 +6,31 @@
# #
# [*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']
# #
# [*syslog_log_facility*] # [*syslog_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/watcher'. # Defaults to '/var/log/watcher'.
# #
# [*log_file*] # [*log_file*]
@ -39,38 +39,38 @@
# #
# [*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*]
# (0ptional) Hash of logger (keys) and level (values) pairs. # (0ptional) 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', # 'sqlalchemy' => 'WARN', 'suds' => 'INFO',
@ -82,11 +82,11 @@
# #
# [*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
@ -97,35 +97,35 @@
# [*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 watcher::logging( class watcher::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'],
$syslog_log_facility = $::os_service_default, $syslog_log_facility = $facts['os_service_default'],
$log_dir = '/var/log/watcher', $log_dir = '/var/log/watcher',
$log_file = '/var/log/watcher/watcher.log', $log_file = '/var/log/watcher/watcher.log',
$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 watcher::deps include watcher::deps

12
manifests/neutron_client.pp
View File

@ -6,21 +6,21 @@
# #
# [*api_version*] # [*api_version*]
# (Optional) Version of Neutron API to use in neutronclient. # (Optional) Version of Neutron API to use in neutronclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*endpoint_type*] # [*endpoint_type*]
# (Optional) Type of endpoint to use in neutronclient. # (Optional) Type of endpoint to use in neutronclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (Optional) Region in Identify service catalog to use for communication # (Optional) Region in Identify service catalog to use for communication
# with the OpenStack service. # with the OpenStack service.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class watcher::neutron_client ( class watcher::neutron_client (
$api_version = $::os_service_default, $api_version = $facts['os_service_default'],
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
) { ) {
include watcher::deps include watcher::deps

12
manifests/nova_client.pp
View File

@ -6,21 +6,21 @@
# #
# [*api_version*] # [*api_version*]
# (Optional) Version of Nova API to use in novaclient. # (Optional) Version of Nova API to use in novaclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*endpoint_type*] # [*endpoint_type*]
# (Optional) Type of endpoint to use in novaclient. # (Optional) Type of endpoint to use in novaclient.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (Optional) Region in Identify service catalog to use for communication # (Optional) Region in Identify service catalog to use for communication
# with the OpenStack service. # with the OpenStack service.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class watcher::nova_client ( class watcher::nova_client (
$api_version = $::os_service_default, $api_version = $facts['os_service_default'],
$endpoint_type = $::os_service_default, $endpoint_type = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
) { ) {
include watcher::deps include watcher::deps

6
manifests/params.pp
View File

@ -7,7 +7,7 @@ class watcher::params {
$user = 'watcher' $user = 'watcher'
$group = 'watcher' $group = 'watcher'
case $::osfamily { case $facts['os']['family'] {
'RedHat': { 'RedHat': {
$api_service_name = 'openstack-watcher-api' $api_service_name = 'openstack-watcher-api'
$api_package_name = 'openstack-watcher-api' $api_package_name = 'openstack-watcher-api'
@ -31,8 +31,8 @@ class watcher::params {
$watcher_wsgi_script_path = '/usr/lib/cgi-bin/watcher' $watcher_wsgi_script_path = '/usr/lib/cgi-bin/watcher'
} }
default: { default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem") fail("Unsupported osfamily: ${facts['os']['family']}")
} }
} # Case $::osfamily } # Case $facts['os']['family']
} }

12
manifests/placement_client.pp
View File

@ -6,21 +6,21 @@
# #
# [*api_version*] # [*api_version*]
# (Optional) Microversion of placement API when using placement service. # (Optional) Microversion of placement API when using placement service.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*interface*] # [*interface*]
# (Optional) Type of endpoint when using placement service. # (Optional) Type of endpoint when using placement service.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*region_name*] # [*region_name*]
# (Optional) Region in Identify service catalog to use for communication # (Optional) Region in Identify service catalog to use for communication
# with the OpenStack service. # with the OpenStack service.
# Defaults to $::os_service_default. # Defaults to $facts['os_service_default'].
# #
class watcher::placement_client ( class watcher::placement_client (
$api_version = $::os_service_default, $api_version = $facts['os_service_default'],
$interface = $::os_service_default, $interface = $facts['os_service_default'],
$region_name = $::os_service_default, $region_name = $facts['os_service_default'],
) { ) {
include watcher::deps include watcher::deps

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 watcher # (Optional) Set of policies to configure for watcher
@ -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 watcher policy folder # (Optional) Path to the watcher 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 watcher::policy ( class watcher::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/watcher/policy.yaml', $policy_path = '/etc/watcher/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,
) { ) {

24
manifests/watcher_clients_auth.pp
View File

@ -29,7 +29,7 @@
# #
# [*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']
# #
# [*auth_type*] # [*auth_type*]
# (Optional) Authentication type to load. # (Optional) Authentication type to load.
@ -37,20 +37,20 @@
# #
# [*insecure*] # [*insecure*]
# (Optional) Verify HTTPS connections. # (Optional) Verify HTTPS connections.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*keyfile*] # [*keyfile*]
# (Optional) PEM encoded client certificate key file. # (Optional) PEM encoded client certificate key file.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*certfile*] # [*certfile*]
# (Optional) PEM encoded client certificate cert file. # (Optional) PEM encoded client certificate cert file.
# Defaults to $::os_service_default # Defaults to $facts['os_service_default']
# #
# [*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']
# #
class watcher::watcher_clients_auth ( class watcher::watcher_clients_auth (
$password, $password,
@ -59,12 +59,12 @@ class watcher::watcher_clients_auth (
$project_name = 'services', $project_name = 'services',
$project_domain_name = 'Default', $project_domain_name = 'Default',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$system_scope = $::os_service_default, $system_scope = $facts['os_service_default'],
$auth_type = 'password', $auth_type = 'password',
$insecure = $::os_service_default, $insecure = $facts['os_service_default'],
$certfile = $::os_service_default, $certfile = $facts['os_service_default'],
$cafile = $::os_service_default, $cafile = $facts['os_service_default'],
$keyfile = $::os_service_default, $keyfile = $facts['os_service_default'],
) { ) {
include watcher::deps include watcher::deps
@ -73,8 +73,8 @@ class watcher::watcher_clients_auth (
$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']
} }
watcher_config { watcher_config {

8
manifests/wsgi/apache.pp
View File

@ -22,7 +22,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.
@ -42,7 +42,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.
@ -121,12 +121,12 @@
# class { 'watcher::wsgi::apache': } # class { 'watcher::wsgi::apache': }
# #
class watcher::wsgi::apache ( class watcher::wsgi::apache (
$servername = $::fqdn, $servername = $facts['networking']['fqdn'],
$port = 9322, $port = 9322,
$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,

2
spec/classes/watcher_api_spec.rb
View File

@ -126,7 +126,7 @@ describe 'watcher::api' do
facts.merge!(OSDefaults.get_facts()) 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'
{ :api_package_name => 'watcher-api', { :api_package_name => 'watcher-api',
:api_service_name => 'watcher-api' } :api_service_name => 'watcher-api' }

2
spec/classes/watcher_applier_spec.rb
View File

@ -86,7 +86,7 @@ describe 'watcher::applier' do
facts.merge!(OSDefaults.get_facts()) 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'
{ :watcher_applier_package => 'watcher-applier', { :watcher_applier_package => 'watcher-applier',
:applier_service_name => 'watcher-applier', :applier_service_name => 'watcher-applier',

2
spec/classes/watcher_client_spec.rb
View File

@ -25,7 +25,7 @@ describe 'watcher::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_name => 'python3-watcherclient' } { :client_package_name => 'python3-watcherclient' }
when 'RedHat' when 'RedHat'

2
spec/classes/watcher_decision_engine_spec.rb
View File

@ -94,7 +94,7 @@ describe 'watcher::decision_engine' do
facts.merge!(OSDefaults.get_facts()) 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'
{ :watcher_decision_engine_package => 'watcher-decision-engine', { :watcher_decision_engine_package => 'watcher-decision-engine',
:decision_engine_service_name => 'watcher-decision-engine', :decision_engine_service_name => 'watcher-decision-engine',

2
spec/classes/watcher_init_spec.rb
View File

@ -227,7 +227,7 @@ describe 'watcher' do
facts.merge!(OSDefaults.get_facts()) 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'
{ :watcher_common_package => 'watcher-common' } { :watcher_common_package => 'watcher-common' }
when 'RedHat' when 'RedHat'

8
spec/classes/watcher_wsgi_apache_spec.rb
View File

@ -10,7 +10,7 @@ describe 'watcher::wsgi::apache' do
:group => 'watcher', :group => 'watcher',
:path => '/', :path => '/',
:priority => 10, :priority => 10,
:servername => facts[:fqdn], :servername => 'foo.example.com',
:ssl => false, :ssl => false,
:threads => 1, :threads => 1,
:user => 'watcher', :user => 'watcher',
@ -145,14 +145,12 @@ describe 'watcher::wsgi::apache' do
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 => 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/watcher', :wsgi_script_path => '/usr/lib/cgi-bin/watcher',