openstack/puppet-mistral
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: Id54c1a0efdb797ab10ddfb002c790d7e01e4e078
This commit is contained in:
Takashi Kajinami
2023-03-02 11:18:28 +09:00
parent aa6a31772c
commit 2ba57c62b9
24 changed files with 264 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manifests/api.pp
View File

@@ -7,22 +7,22 @@
# [*allow_action_execution_deletion*]
# (Optional) Enables the ability to delete action_execution
# which has no relationship with workflows. (boolean value).
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*api_workers*]
# (Optional) Number of workers for Mistral API service
# default is equal to the number of CPUs available if that can
# be determined, else a default worker count of 1 is returned.
# Defaults to $::os_workers
# Defaults to $facts['os_workers']
#
# [*bind_host*]
# (Optional) Address to bind the server. Useful when
# selecting a particular network interface.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*bind_port*]
# (Optional) The port on which the server will listen.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*enabled*]
# (optional) Should the service be enabled.
@@ -48,27 +48,27 @@
# [*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'].
#
# [*auth_strategy*]
# (optional) Type of authentication to be used.
# Defaults to 'keystone'
#
class mistral::api (
$allow_action_execution_deletion = $::os_service_default,
$api_workers = $::os_workers,
$bind_host = $::os_service_default,
$bind_port = $::os_service_default,
$allow_action_execution_deletion = $facts['os_service_default'],
$api_workers = $facts['os_workers'],
$bind_host = $facts['os_service_default'],
$bind_port = $facts['os_service_default'],
$enabled = true,
$manage_service = true,
$package_ensure = present,
$service_name = $::mistral::params::api_service_name,
$enable_proxy_headers_parsing = $::os_service_default,
$max_request_body_size = $::os_service_default,
$enable_proxy_headers_parsing = $facts['os_service_default'],
$max_request_body_size = $facts['os_service_default'],
$auth_strategy = 'keystone',
) inherits mistral::params {

8
manifests/coordination.pp
View File

@@ -6,15 +6,15 @@
#
# [*backend_url*]
# (Optional) Coordination backend URL.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*heartbeat_interval*]
# (Optional) Number of seconds between heartbeats for coordination.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class mistral::coordination (
$backend_url = $::os_service_default,
$heartbeat_interval = $::os_service_default,
$backend_url = $facts['os_service_default'],
$heartbeat_interval = $facts['os_service_default'],
) {
include mistral::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 mistral::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 mistral::deps

8
manifests/cron_trigger.pp
View File

@@ -9,7 +9,7 @@
# cron triggers is disabled.
# Disabling cron triggers increases system performance.
# (boolean value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*execution_interval*]
# (Optional) This setting defines how frequently Mistral checks for cron
@@ -20,12 +20,12 @@
# but if the execution_interval is set to 60, it will only run
# once per minute.
# (integer value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
#
class mistral::cron_trigger (
$enabled = $::os_service_default,
$execution_interval = $::os_service_default,
$enabled = $facts['os_service_default'],
$execution_interval = $facts['os_service_default'],
) {
include mistral::deps

32
manifests/db.pp
View File

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

32
manifests/engine.pp
View File

@@ -18,52 +18,52 @@
# [*host*]
# (Optional) Name of the engine node. This can be an opaque identifier.
# It is not necessarily a hostname, FQDN, or IP address. (string value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*topic*]
# (Optional) The message topic that the engine listens on.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*version*]
# (Optional) The version of the engine. (string value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*execution_field_size_limit_kb*]
# (Optional) The default maximum size in KB of large text fields
# of runtime execution objects. Use -1 for no limit.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*execution_integrity_check_delay*]
# (Optional) A number of seconds since the last update of a task execution
# in RUNNING state after which Mistral will start checking its integrity.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*execution_integrity_check_batch_size*]
# (Optional) A number of task executions in RUNNING state that the execution
# integrity checker can process in a single iteration.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*action_definition_cache_time*]
# (Optional) A number of seconds that indicates how long action definitions
# should be stored in the local cache.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*start_subworkflows_via_rpc*]
# (Optional) Enables starting subworkflows via RPC.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class mistral::engine (
$package_ensure = present,
$manage_service = true,
$enabled = true,
$host = $::os_service_default,
$topic = $::os_service_default,
$version = $::os_service_default,
$execution_field_size_limit_kb = $::os_service_default,
$execution_integrity_check_delay = $::os_service_default,
$execution_integrity_check_batch_size = $::os_service_default,
$action_definition_cache_time = $::os_service_default,
$start_subworkflows_via_rpc = $::os_service_default,
$host = $facts['os_service_default'],
$topic = $facts['os_service_default'],
$version = $facts['os_service_default'],
$execution_field_size_limit_kb = $facts['os_service_default'],
$execution_integrity_check_delay = $facts['os_service_default'],
$execution_integrity_check_batch_size = $facts['os_service_default'],
$action_definition_cache_time = $facts['os_service_default'],
$start_subworkflows_via_rpc = $facts['os_service_default'],
) {
include mistral::deps

12
manifests/event_engine.pp
View File

@@ -18,23 +18,23 @@
# [*host*]
# (Optional) Name of the engine node. This can be an opaque identifier.
# It is not necessarily a hostname, FQDN, or IP address. (string value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*topic*]
# (Optional) The message topic that the engine listens on.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*event_definitions_cfg_file*]
# (Optional) The path to the event_definitions config file.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class mistral::event_engine (
$package_ensure = present,
$manage_service = true,
$enabled = true,
$host = $::os_service_default,
$topic = $::os_service_default,
$event_definitions_cfg_file = $::os_service_default,
$host = $facts['os_service_default'],
$topic = $facts['os_service_default'],
$event_definitions_cfg_file = $facts['os_service_default'],
) {
include mistral::deps

20
manifests/execution_expiration_policy.pp
View File

@@ -6,32 +6,32 @@
#
# [*evaluation_interval*]
# (Optional) How often will the executions be evaluated (in minutes).
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*older_than*]
# (Optional) Evaluate from which time remove executions in minutes.
# Note that only final state execution will remove (SUCCESS/ERROR).
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*max_finished_executions*]
# (Optional) The maximum number of finished workflow executions to be stored.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*batch_size*]
# (Optional) Size of batch of expired executions to be deleted.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*ignored_states*]
# (Optional) The states that the expiration policy will filter out and will
# not delete.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class mistral::execution_expiration_policy (
$evaluation_interval = $::os_service_default,
$older_than = $::os_service_default,
$max_finished_executions = $::os_service_default,
$batch_size = $::os_service_default,
$ignored_states = $::os_service_default,
$evaluation_interval = $facts['os_service_default'],
$older_than = $facts['os_service_default'],
$max_finished_executions = $facts['os_service_default'],
$batch_size = $facts['os_service_default'],
$ignored_states = $facts['os_service_default'],
) {
include mistral::deps

12
manifests/executor.pp
View File

@@ -18,23 +18,23 @@
# [*host*]
# (Optional) Name of the executor node. This can be an opaque identifier.
# It is not necessarily a hostname, FQDN, or IP address. (string value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*topic*]
# (Optional) The message topic that the executor listens on. (string value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*version*]
# (Optional) The version of the executor. (string value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class mistral::executor (
$package_ensure = present,
$manage_service = true,
$enabled = true,
$host = $::os_service_default,
$topic = $::os_service_default,
$version = $::os_service_default,
$host = $facts['os_service_default'],
$topic = $facts['os_service_default'],
$version = $facts['os_service_default'],
) {
include mistral::deps

96
manifests/init.pp
View File

@@ -11,32 +11,32 @@
# [*os_actions_endpoint_type*]
# (optional) Type of endpoint in identity service catalog to use for
# communication with OpenStack services
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*default_transport_url*]
# (optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*notification_transport_url*]
# (optional) A URL representing the messaging driver to use for notifications
# and its full configuration. Transport URLs take the form:
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*notification_driver*]
# (optional) Driver or drivers to handle sending notifications.
# Value can be a string or a list.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_ha_queues*]
# (optional) Use HA queues in RabbitMQ (x-ha-policy: all).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_heartbeat_timeout_threshold*]
# (optional) Number of seconds after which the RabbitMQ broker is considered
@@ -44,14 +44,14 @@
# Heartbeating helps to ensure the TCP connection to RabbitMQ isn't silently
# closed, resulting in missed or lost messages from the queue.
# (Requires kombu >= 3.0.7 and amqp >= 1.4.0)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_heartbeat_rate*]
# (optional) How often during the rabbit_heartbeat_timeout_threshold period to
# check the heartbeat on RabbitMQ connection. (i.e. rabbit_heartbeat_rate=2
# when rabbit_heartbeat_timeout_threshold=60, the heartbeat will be checked
# every 30 seconds.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_heartbeat_in_pthread*]
# (Optional) EXPERIMENTAL: Run the health check heartbeat thread
@@ -61,64 +61,64 @@
# example if the parent process have monkey patched the
# stdlib by using eventlet/greenlet then the heartbeat
# will be run through a green thread.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rabbit_use_ssl*]
# (optional) Connect over SSL for RabbitMQ
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*report_interval*]
# (optional) Interval, in seconds, between nodes reporting state to
# datastore (integer value).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*service_down_time*]
# (optional) Maximum time since last check-in for a service to be
# considered up (integer value).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_failover_strategy*]
# (Optional) Determines how the next RabbitMQ node is chosen in case the one
# we are currently connected to becomes unavailable. Takes effect only if
# more than one RabbitMQ node is provided in config. (string value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_ca_certs*]
# (optional) SSL certification authority file (valid only if SSL enabled).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_certfile*]
# (optional) SSL cert file (valid only if SSL enabled).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_keyfile*]
# (optional) SSL key file (valid only if SSL enabled).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_version*]
# (optional) SSL version to use (valid only if SSL enabled).
# Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be
# available on some distributions.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_reconnect_delay*]
# (optional) How long to wait before reconnecting in response to an AMQP
# consumer cancel notification.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*amqp_durable_queues*]
# (optional)Use durable queues in amqp.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*control_exchange*]
# (Optional) The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the transport_url
# option.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rpc_response_timeout*]
# (Optional) Seconds to wait for a response from a call. (integer value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*purge_config*]
# (optional) Whether to set only the specified config options
@@ -133,7 +133,7 @@
# (Optional) The maximum amount of missed heartbeats to be allowed.
# If set to 0 then this feature is disabled. See check_interval for more
# details.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*check_interval*]
# (Optional) How often (in seconds) action executions are checked.
@@ -142,7 +142,7 @@
# transit all running action executions to error if the last
# heartbeat received is older than 10 * max_missed_heartbeats
# seconds. If set to 0 then this feature is disabled.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*first_heartbeat_timeout*]
# (Optional) The first heartbeat is handled differently, to provide a
@@ -150,36 +150,36 @@
# the action execution. For example when first_heartbeat_timeout = 3600, wait
# 3600 seconds before closing the action executions that never received a
# heartbeat.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class mistral(
$package_ensure = 'present',
$os_actions_endpoint_type = $::os_service_default,
$control_exchange = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$default_transport_url = $::os_service_default,
$notification_transport_url = $::os_service_default,
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
$rabbit_ha_queues = $::os_service_default,
$rabbit_heartbeat_timeout_threshold = $::os_service_default,
$rabbit_heartbeat_rate = $::os_service_default,
$rabbit_heartbeat_in_pthread = $::os_service_default,
$rabbit_use_ssl = $::os_service_default,
$service_down_time = $::os_service_default,
$report_interval = $::os_service_default,
$kombu_failover_strategy = $::os_service_default,
$kombu_ssl_ca_certs = $::os_service_default,
$kombu_ssl_certfile = $::os_service_default,
$kombu_ssl_keyfile = $::os_service_default,
$kombu_ssl_version = $::os_service_default,
$kombu_reconnect_delay = $::os_service_default,
$amqp_durable_queues = $::os_service_default,
$os_actions_endpoint_type = $facts['os_service_default'],
$control_exchange = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$default_transport_url = $facts['os_service_default'],
$notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'],
$rabbit_ha_queues = $facts['os_service_default'],
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
$rabbit_heartbeat_rate = $facts['os_service_default'],
$rabbit_heartbeat_in_pthread = $facts['os_service_default'],
$rabbit_use_ssl = $facts['os_service_default'],
$service_down_time = $facts['os_service_default'],
$report_interval = $facts['os_service_default'],
$kombu_failover_strategy = $facts['os_service_default'],
$kombu_ssl_ca_certs = $facts['os_service_default'],
$kombu_ssl_certfile = $facts['os_service_default'],
$kombu_ssl_keyfile = $facts['os_service_default'],
$kombu_ssl_version = $facts['os_service_default'],
$kombu_reconnect_delay = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'],
$purge_config = false,
$sync_db = true,
$max_missed_heartbeats = $::os_service_default,
$check_interval = $::os_service_default,
$first_heartbeat_timeout = $::os_service_default,
$max_missed_heartbeats = $facts['os_service_default'],
$check_interval = $facts['os_service_default'],
$first_heartbeat_timeout = $facts['os_service_default'],
){
include mistral::deps

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 mistral::keystone::authtoken(
$username = 'mistral',
$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 = {},
) {

78
manifests/logging.pp
View File

@@ -6,72 +6,72 @@
#
# [*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 $::os_service_default, it will not log to any
# If set to boolean false or $facts['os_service_default'], it will not log to any
# directory.
# Defaults to '/var/log/mistral'
#
# [*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']
#
# [*logging_context_format_string*]
# (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\
# [%(request_id)s %(user_identity)s] %(instance)s%(message)s'
#
# [*logging_default_format_string*]
# (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\
# [-] %(instance)s%(message)s'
#
# [*logging_debug_format_suffix*]
# (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'
#
# [*logging_exception_prefix*]
# (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'
#
# [*log_config_append*]
# (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
#
# [*default_log_levels*]
# (Optional) Hash of logger (keys) and level (values) pairs.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
# Example:
# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
@@ -79,50 +79,50 @@
#
# [*publish_errors*]
# (Optional) Publish error events (boolean value).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*fatal_deprecations*]
# (Optional) Make deprecations fatal (boolean value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*instance_format*]
# (Optional) If an instance is passed with the log message, format it
# like this (string value).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: '[instance: %(uuid)s] '
#
# [*instance_uuid_format*]
# (Optional) If an instance UUID is passed with the log message, format
# it like this (string value).
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
# Example: instance_uuid_format='[instance: %(uuid)s] '
#
# [*log_date_format*]
# (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'
#
class mistral::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/mistral',
$log_file = $::os_service_default,
$watch_log_file = $::os_service_default,
$debug = $::os_service_default,
$logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default,
$logging_debug_format_suffix = $::os_service_default,
$logging_exception_prefix = $::os_service_default,
$log_config_append = $::os_service_default,
$default_log_levels = $::os_service_default,
$publish_errors = $::os_service_default,
$fatal_deprecations = $::os_service_default,
$instance_format = $::os_service_default,
$instance_uuid_format = $::os_service_default,
$log_date_format = $::os_service_default,
$log_file = $facts['os_service_default'],
$watch_log_file = $facts['os_service_default'],
$debug = $facts['os_service_default'],
$logging_context_format_string = $facts['os_service_default'],
$logging_default_format_string = $facts['os_service_default'],
$logging_debug_format_suffix = $facts['os_service_default'],
$logging_exception_prefix = $facts['os_service_default'],
$log_config_append = $facts['os_service_default'],
$default_log_levels = $facts['os_service_default'],
$publish_errors = $facts['os_service_default'],
$fatal_deprecations = $facts['os_service_default'],
$instance_format = $facts['os_service_default'],
$instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
) {
include mistral::deps

16
manifests/notifier.pp
View File

@@ -9,31 +9,31 @@
# the engine server. Use remote if the notifier is launched as a separate
# server to process events.
# (string value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*host*]
# (Optional) Name of the notifier node. This can be an opaque identifier.
# It is not necessarily a hostname, FQDN, or IP address.
# (string value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*topic*]
# (Optional) The message topic that the notifier server listens on.
# (string value)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*notify_publishers*]
# (Optional) List of publishers to publish notification.
# Note: This maps to the mistral config option `notify` but this is reserved
# in Puppet.
# (list of dicts)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class mistral::notifier(
$type = $::os_service_default,
$host = $::os_service_default,
$topic = $::os_service_default,
$notify_publishers = $::os_service_default,
$type = $facts['os_service_default'],
$host = $facts['os_service_default'],
$topic = $facts['os_service_default'],
$notify_publishers = $facts['os_service_default'],
) {
include mistral::deps

6
manifests/params.pp
View File

@@ -11,7 +11,7 @@ class mistral::params {
$user = 'mistral'
$group = 'mistral'
case $::osfamily {
case $facts['os']['family'] {
'RedHat': {
$common_package_name = 'openstack-mistral-common'
$api_package_name = 'openstack-mistral-api'
@@ -39,9 +39,7 @@ class mistral::params {
$mistral_wsgi_script_source = '/usr/bin/mistral-wsgi-api'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: \
${::operatingsystem}, module ${module_name} only support osfamily \
RedHat and Debian")
fail("Unsupported osfamily: ${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 mistral
@@ -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 mistral 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 mistral::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/mistral/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,
) {

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 { 'mistral::wsgi::apache': }
#
class mistral::wsgi::apache (
$servername = $::fqdn,
$servername = $facts['networking']['fqdn'],
$port = 8989,
$bind_host = undef,
$path = '/',
$ssl = false,
$workers = $::os_workers,
$workers = $facts['os_workers'],
$ssl_cert = undef,
$ssl_key = undef,
$ssl_chain = undef,

7
spec/classes/mistral_api_spec.rb
View File

@@ -127,14 +127,11 @@ describe 'mistral::api' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts({
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'some.host.tld',
}))
facts.merge!(OSDefaults.get_facts())
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :api_service_name => 'mistral-api' }
when 'RedHat'

2
spec/classes/mistral_client_spec.rb
View File

@@ -27,7 +27,7 @@ describe 'mistral::client' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :client_package => 'python3-mistralclient' }
when 'RedHat'

5
spec/classes/mistral_db_sync_spec.rb
View File

@@ -47,10 +47,7 @@ describe 'mistral::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 'mistral-db-sync'

2
spec/classes/mistral_engine_spec.rb
View File

@@ -105,7 +105,7 @@ describe 'mistral::engine' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :engine_service_name => 'mistral-engine' }
when 'RedHat'

2
spec/classes/mistral_event_engine_spec.rb
View File

@@ -66,7 +66,7 @@ describe 'mistral::event_engine' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :event_engine_service_name => 'mistral-event-engine' }
when 'RedHat'

2
spec/classes/mistral_executor_spec.rb
View File

@@ -63,7 +63,7 @@ describe 'mistral::executor' do
end
let (:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :executor_service_name => 'mistral-executor' }
when 'RedHat'

2
spec/classes/mistral_logging_spec.rb
View File

@@ -127,7 +127,7 @@ describe 'mistral::logging' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({:os_workers => 8}))
facts.merge(OSDefaults.get_facts())
end
it_configures 'mistral-logging'

8
spec/classes/mistral_wsgi_apache_spec.rb
View File

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