openstack
/
puppet-magnum
Code Issues Proposed changes

Replace legacy facts and use fact hash 

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

Change-Id: I60600b673171f0e616d48680001dbc1e17c2a3aa
This commit is contained in:
Takashi Kajinami 2023-03-02 11:11:54 +09:00
parent b8137be3b0
commit e7200ad4e0
32 changed files with 319 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/api.pp
View File

@ -53,21 +53,21 @@
# [*ssl_cert_file*]
# (Optional) Location of the SSL certificate file to use for SSL mode.
# Required when $enabled_ssl is set to 'true'.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*ssl_key_file*]
# (Optional) Location of the SSL key file to use for enabling SSL mode.
# Required when $enabled_ssl is set to 'true'.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*workers*]
# (Optional) Number of API workers.
# Defaults to $::os_workers
# Defaults to $facts['os_workers']
#
# [*enable_proxy_headers_parsing*]
# (optional) This determines if the HTTPProxyToWSGI
# middleware should parse the proxy headers or not.(boolean value)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class magnum::api(
$package_ensure = 'present',
@ -80,10 +80,10 @@ class magnum::api(
$sync_db = true,
$auth_strategy = 'keystone',
$enabled_ssl = false,
$ssl_cert_file = $::os_service_default,
$ssl_key_file = $::os_service_default,
$workers = $::os_workers,
$enable_proxy_headers_parsing = $::os_service_default,
$ssl_cert_file = $facts['os_service_default'],
$ssl_key_file = $facts['os_service_default'],
$workers = $facts['os_workers'],
$enable_proxy_headers_parsing = $facts['os_service_default'],
) inherits magnum::params {
include magnum::deps

2
manifests/certificates.pp
View File

@ -9,7 +9,7 @@
# Defaults to 'barbican'
#
class magnum::certificates (
$cert_manager_type = $::os_service_default,
$cert_manager_type = $facts['os_service_default'],
) {
include magnum::deps

16
manifests/cinder.pp
View File

@ -6,25 +6,25 @@
#
# [*default_docker_volume_type*]
# (optional) Default cinder volume_type for docker storage
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*default_etcd_volume_type*]
# (optional) Default cinder volume_type for etcd storage
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*default_boot_volume_type*]
# (optional) Default cinder volume_type for boot disk
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*default_boot_volume_size*]
# (optional) Default volume size for boot disk
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class magnum::cinder (
$default_docker_volume_type = $::os_service_default,
$default_etcd_volume_type = $::os_service_default,
$default_boot_volume_type = $::os_service_default,
$default_boot_volume_size = $::os_service_default,
$default_docker_volume_type = $facts['os_service_default'],
$default_etcd_volume_type = $facts['os_service_default'],
$default_boot_volume_type = $facts['os_service_default'],
$default_boot_volume_size = $facts['os_service_default'],
) {
include magnum::deps

12
manifests/clients.pp
View File

@ -16,15 +16,15 @@
#
# [*ca_file*]
# (optional) CA cert file to use in SSL connections.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*cert_file*]
# (optional) PEM-formatted certificate chain file.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*key_file*]
# (optional) PEM-formatted file that contains the private key.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*insecure*]
# (optional) If set, then the server's certificate will not be verified.
@ -33,9 +33,9 @@
class magnum::clients (
$region_name = 'RegionOne',
$endpoint_type = 'publicURL',
$ca_file = $::os_service_default,
$cert_file = $::os_service_default,
$key_file = $::os_service_default,
$ca_file = $facts['os_service_default'],
$cert_file = $facts['os_service_default'],
$key_file = $facts['os_service_default'],
$insecure = false
) {
include magnum::deps

10
manifests/clients/cinder.pp
View File

@ -16,19 +16,19 @@
#
# [*api_version*]
# (optional) Version of Cinder API to use in cinderclient.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ca_file*]
# (optional) CA cert file to use in SSL connections.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*cert_file*]
# (optional) PEM-formatted certificate chain file.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*key_file*]
# (optional) PEM-formatted file that contains the private key.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*insecure*]
# (optional) If set, then the server's certificate will not be verified.
@ -37,7 +37,7 @@
class magnum::clients::cinder(
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
$api_version = $::os_service_default,
$api_version = $facts['os_service_default'],
$ca_file = $magnum::clients::ca_file,
$cert_file = $magnum::clients::cert_file,
$key_file = $magnum::clients::key_file,

10
manifests/clients/glance.pp
View File

@ -16,19 +16,19 @@
#
# [*api_version*]
# (optional) Version of Glance API to use in glanceclient.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ca_file*]
# (optional) CA cert file to use in SSL connections.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*cert_file*]
# (optional) PEM-formatted certificate chain file.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*key_file*]
# (optional) PEM-formatted file that contains the private key.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*insecure*]
# (optional) If set, then the server's certificate will not be verified.
@ -38,7 +38,7 @@
class magnum::clients::glance(
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
$api_version = $::os_service_default,
$api_version = $facts['os_service_default'],
$ca_file = $magnum::clients::ca_file,
$cert_file = $magnum::clients::cert_file,
$key_file = $magnum::clients::key_file,

10
manifests/clients/heat.pp
View File

@ -16,19 +16,19 @@
#
# [*api_version*]
# (optional) Version of heat API to use in heatclient.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ca_file*]
# (optional) CA cert file to use in SSL connections.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*cert_file*]
# (optional) PEM-formatted certificate chain file.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*key_file*]
# (optional) PEM-formatted file that contains the private key.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*insecure*]
# (optional) If set, then the server's certificate will not be verified.
@ -38,7 +38,7 @@
class magnum::clients::heat(
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
$api_version = $::os_service_default,
$api_version = $facts['os_service_default'],
$ca_file = $magnum::clients::ca_file,
$cert_file = $magnum::clients::cert_file,
$key_file = $magnum::clients::key_file,

6
manifests/clients/neutron.pp
View File

@ -16,15 +16,15 @@
#
# [*ca_file*]
# (optional) CA cert file to use in SSL connections.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*cert_file*]
# (optional) PEM-formatted certificate chain file.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*key_file*]
# (optional) PEM-formatted file that contains the private key.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*insecure*]
# (optional) If set, then the server's certificate will not be verified.

10
manifests/clients/nova.pp
View File

@ -16,19 +16,19 @@
#
# [*api_version*]
# (optional) Version of nova API to use in novaclient.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*ca_file*]
# (optional) CA cert file to use in SSL connections.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*cert_file*]
# (optional) PEM-formatted certificate chain file.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*key_file*]
# (optional) PEM-formatted file that contains the private key.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*insecure*]
# (optional) If set, then the server's certificate will not be verified.
@ -38,7 +38,7 @@
class magnum::clients::nova(
$region_name = $magnum::clients::region_name,
$endpoint_type = $magnum::clients::endpoint_type,
$api_version = $::os_service_default,
$api_version = $facts['os_service_default'],
$ca_file = $magnum::clients::ca_file,
$cert_file = $magnum::clients::cert_file,
$key_file = $magnum::clients::key_file,

6
manifests/clients/octavia.pp
View File

@ -16,15 +16,15 @@
#
# [*ca_file*]
# (optional) CA cert file to use in SSL connections.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*cert_file*]
# (optional) PEM-formatted certificate chain file.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*key_file*]
# (optional) PEM-formatted file that contains the private key.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*insecure*]
# (optional) If set, then the server's certificate will not be verified.

16
manifests/cluster.pp
View File

@ -6,27 +6,27 @@
#
# [*etcd_discovery_service_endpoint_format*]
# (optional) Url for etcd public discovery endpoint.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*nodes_affinity_policy*]
# (optional) Affinity policy for server group of cluster nodes.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*temp_cache_dir*]
# (optional) Explicitly specify the temporary directory to hold cached TLS
# certs.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*pre_delete_lb_timeout*]
# (optional) The timeout in seconds to wait for the load balancers to be
# deleted.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class magnum::cluster (
$etcd_discovery_service_endpoint_format = $::os_service_default,
$nodes_affinity_policy = $::os_service_default,
$temp_cache_dir = $::os_service_default,
$pre_delete_lb_timeout = $::os_service_default,
$etcd_discovery_service_endpoint_format = $facts['os_service_default'],
$nodes_affinity_policy = $facts['os_service_default'],
$temp_cache_dir = $facts['os_service_default'],
$pre_delete_lb_timeout = $facts['os_service_default'],
) {
include magnum::deps

8
manifests/cluster_template.pp
View File

@ -6,15 +6,15 @@
#
# [*kubernetes_allowed_network_drivers*]
# (optional) Allowed network drivers for kubernetes cluster-templates.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kubernetes_default_network_driver*]
# (optional) Default network driver for kubernetes.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class magnum::cluster_template (
$kubernetes_allowed_network_drivers = $::os_service_default,
$kubernetes_default_network_driver = $::os_service_default,
$kubernetes_allowed_network_drivers = $facts['os_service_default'],
$kubernetes_default_network_driver = $facts['os_service_default'],
) {
include magnum::deps

8
manifests/conductor.pp
View File

@ -19,7 +19,7 @@
# [*conductor_life_check_timeout*]
# (optional) RPC timeout for the conductor liveness check that is
# used for bay locking.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auth_strategy*]
# (optional) Type of authentication to be used.
@ -27,15 +27,15 @@
#
# [*workers*]
# (optional) Number of conductor workers.
# Defaults to $::os_workers
# Defaults to $facts['os_workers']
#
class magnum::conductor(
$enabled = true,
$manage_service = true,
$package_ensure = 'present',
$conductor_life_check_timeout = $::os_service_default,
$conductor_life_check_timeout = $facts['os_service_default'],
$auth_strategy = 'keystone',
$workers = $::os_workers,
$workers = $facts['os_workers'],
) {
include magnum::db

32
manifests/db.pp
View File

@ -10,49 +10,49 @@
#
# [*database_connection_recycle_time*]
# (Optional) Timeout when db connections should be reaped.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*database_max_retries*]
# (Optional) Maximum number of database connection retries during startup.
# Setting -1 implies an infinite retry count.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*database_retry_interval*]
# (Optional) Interval between retries of opening a database connection.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*database_max_pool_size*]
# (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*]
# (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*]
# (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 magnum::db (
$database_connection = 'mysql+pymysql://magnum:magnum@localhost:3306/magnum',
$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 magnum::deps

8
manifests/docker_registry.pp
View File

@ -6,16 +6,16 @@
#
# [*swift_region*]
# (optional) Region name of Swift.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*swift_registry_container*]
# (optional) Name of the container in Swift which docker registry stores
# images in.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class magnum::docker_registry (
$swift_region = $::os_service_default,
$swift_registry_container = $::os_service_default,
$swift_region = $facts['os_service_default'],
$swift_registry_container = $facts['os_service_default'],
) {
magnum_config {

16
manifests/healthcheck.pp
View File

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

136
manifests/init.pp
View File

@ -12,36 +12,36 @@
# (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_topics*]
# (Optional) AMQP topics to publish to when using the RPC notification driver.
# (list value)
# Default to $::os_service_default
# Default to $facts['os_service_default']
#
# [*notification_driver*]
# (Optional) Notification driver to use
# 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']
#
# [*rpc_response_timeout*]
# (Optional) Seconds to wait for a response from a call.
# 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']
#
# [*rabbit_ha_queues*]
# (Optional) Use HA queues in RabbitMQ.
# 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
@ -49,14 +49,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
@ -66,110 +66,110 @@
# 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 rabbit
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_ca_certs*]
# (Optional) SSL certification authority file (valid only if rabbit SSL is enabled)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_certfile*]
# (Optional) SSL cert file (valid only if rabbit SSL is enabled)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_keyfile*]
# (Optional) SSL key file (valid only if rabbit SSL is enabled)
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*kombu_ssl_version*]
# (Optional) SSL version to use (valid only if rabbit SSL is 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. (floating point 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_compression*]
# (optional) Possible values are: gzip, bz2. If not set compression will not
# be used. This option may not be available in future versions. EXPERIMENTAL.
# (string value)
# 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'].
#
# [*amqp_server_request_prefix*]
# (Optional) Address prefix used when sending to a specific server
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_broadcast_prefix*]
# (Optional) address prefix used when broadcasting to all servers
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_group_request_prefix*]
# (Optional) address prefix when sending to any server in group
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_container_name*]
# (Optional) Name for the AMQP container
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_idle_timeout*]
# (Optional) Timeout for inactive connections
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_trace*]
# (Optional) Debug: dump AMQP frames to stdout
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_ssl_ca_file*]
# (Optional) CA certificate PEM file to verify server certificate
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_ssl_cert_file*]
# (Optional) Identifying certificate PEM file to present to clients
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_ssl_key_file*]
# (Optional) Private key PEM file used to sign cert_file certificate
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_ssl_key_password*]
# (Optional) Password for decrypting ssl_key_file (if encrypted)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_sasl_mechanisms*]
# (Optional) Space separated list of acceptable SASL mechanisms
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_sasl_config_dir*]
# (Optional) Path to directory that contains the SASL configuration
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_sasl_config_name*]
# (Optional) Name of configuration file (without .conf suffix)
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_username*]
# (Optional) User name for message broker authentication
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*amqp_password*]
# (Optional) Password for message broker authentication
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*purge_config*]
# (Optional) Whether to set only the specified config options
@ -178,40 +178,40 @@
#
class magnum(
$package_ensure = 'present',
$notification_transport_url = $::os_service_default,
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
$default_transport_url = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$control_exchange = $::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,
$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,
$kombu_failover_strategy = $::os_service_default,
$kombu_compression = $::os_service_default,
$amqp_durable_queues = $::os_service_default,
$amqp_server_request_prefix = $::os_service_default,
$amqp_broadcast_prefix = $::os_service_default,
$amqp_group_request_prefix = $::os_service_default,
$amqp_container_name = $::os_service_default,
$amqp_idle_timeout = $::os_service_default,
$amqp_trace = $::os_service_default,
$amqp_ssl_ca_file = $::os_service_default,
$amqp_ssl_cert_file = $::os_service_default,
$amqp_ssl_key_file = $::os_service_default,
$amqp_ssl_key_password = $::os_service_default,
$amqp_sasl_mechanisms = $::os_service_default,
$amqp_sasl_config_dir = $::os_service_default,
$amqp_sasl_config_name = $::os_service_default,
$amqp_username = $::os_service_default,
$amqp_password = $::os_service_default,
$notification_transport_url = $facts['os_service_default'],
$notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'],
$default_transport_url = $facts['os_service_default'],
$rpc_response_timeout = $facts['os_service_default'],
$control_exchange = $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'],
$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'],
$kombu_failover_strategy = $facts['os_service_default'],
$kombu_compression = $facts['os_service_default'],
$amqp_durable_queues = $facts['os_service_default'],
$amqp_server_request_prefix = $facts['os_service_default'],
$amqp_broadcast_prefix = $facts['os_service_default'],
$amqp_group_request_prefix = $facts['os_service_default'],
$amqp_container_name = $facts['os_service_default'],
$amqp_idle_timeout = $facts['os_service_default'],
$amqp_trace = $facts['os_service_default'],
$amqp_ssl_ca_file = $facts['os_service_default'],
$amqp_ssl_cert_file = $facts['os_service_default'],
$amqp_ssl_key_file = $facts['os_service_default'],
$amqp_ssl_key_password = $facts['os_service_default'],
$amqp_sasl_mechanisms = $facts['os_service_default'],
$amqp_sasl_config_dir = $facts['os_service_default'],
$amqp_sasl_config_name = $facts['os_service_default'],
$amqp_username = $facts['os_service_default'],
$amqp_password = $facts['os_service_default'],
$purge_config = false,
) {

116
manifests/keystone/authtoken.pp
View File

@ -10,7 +10,7 @@
#
# [*password*]
# (Required) 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,56 +81,56 @@
# 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
@ -138,17 +138,17 @@
# 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.
@ -156,13 +156,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.
@ -172,62 +172,62 @@
# 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'].
#
class magnum::keystone::authtoken(
$username = 'magnum',
$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'],
) {
include magnum::deps

26
manifests/keystone/domain.pp
View File

@ -6,7 +6,7 @@
#
# [*cluster_user_trust*]
# enable creation of a user trust for clusters.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*domain_name*]
# magnum domain name.
@ -14,7 +14,7 @@
#
# [*domain_id*]
# id of the domain to create trustee for clusters.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*domain_admin*]
# Keystone domain admin user which will be created.
@ -22,7 +22,7 @@
#
# [*domain_admin_id*]
# Id of the admin with roles sufficient to manage users in the trustee_domain.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*domain_admin_domain_name*]
# Name of the domain admin user's domain.
@ -30,7 +30,7 @@
#
# [*domain_admin_domain_id*]
# Id of the domain admin user's domain.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*domain_admin_email*]
# Keystone domain admin user email address.
@ -42,7 +42,7 @@
#
# [*roles*]
# The roles which are delegated to the trustee by the trustor.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*keystone_interface*]
# Auth interface used by instances/trustee.
@ -51,7 +51,7 @@
# [*keystone_region_name*]
# Region in Identity service catalog to use for
# communication with the OpenStack service.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*manage_domain*]
# Whether manage or not the domain creation.
@ -68,18 +68,18 @@
# Defaults to 'true'.
#
class magnum::keystone::domain (
$cluster_user_trust = $::os_service_default,
$cluster_user_trust = $facts['os_service_default'],
$domain_name = 'magnum',
$domain_id = $::os_service_default,
$domain_id = $facts['os_service_default'],
$domain_admin = 'magnum_admin',
$domain_admin_id = $::os_service_default,
$domain_admin_id = $facts['os_service_default'],
$domain_admin_email = 'magnum_admin@localhost',
$domain_password = 'changeme',
$domain_admin_domain_name = $::os_service_default,
$domain_admin_domain_id = $::os_service_default,
$roles = $::os_service_default,
$domain_admin_domain_name = $facts['os_service_default'],
$domain_admin_domain_id = $facts['os_service_default'],
$roles = $facts['os_service_default'],
$keystone_interface = 'public',
$keystone_region_name = $::os_service_default,
$keystone_region_name = $facts['os_service_default'],
$manage_domain = true,
$manage_user = true,
$manage_role = true,

24
manifests/keystone/keystone_auth.pp
View File

@ -29,7 +29,7 @@
#
# [*system_scope*]
# (Optional) Scope for system operations.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*auth_type*]
# (Optional) Authentication type to load
@ -38,20 +38,20 @@
# [*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'].
#
# [*keyfile*]
# (Optional) Required if identity server requires client certificate
# 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.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class magnum::keystone::keystone_auth(
$password,
@ -60,12 +60,12 @@ class magnum::keystone::keystone_auth(
$project_name = 'services',
$user_domain_name = 'Default',
$project_domain_name = 'Default',
$system_scope = $::os_service_default,
$system_scope = $facts['os_service_default'],
$auth_type = 'password',
$cafile = $::os_service_default,
$keyfile = $::os_service_default,
$certfile = $::os_service_default,
$insecure = $::os_service_default,
$cafile = $facts['os_service_default'],
$keyfile = $facts['os_service_default'],
$certfile = $facts['os_service_default'],
$insecure = $facts['os_service_default'],
) {
include magnum::deps
@ -74,8 +74,8 @@ class magnum::keystone::keystone_auth(
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
} else {
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
$project_name_real = $facts['os_service_default']
$project_domain_name_real = $facts['os_service_default']
}
magnum_config {

76
manifests/logging.pp
View File

@ -6,27 +6,27 @@
#
# [*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.
@ -35,42 +35,42 @@
#
# [*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',
@ -82,50 +82,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 magnum::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/magnum',
$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 magnum::deps

6
manifests/params.pp
View File

@ -8,7 +8,7 @@ class magnum::params {
$user = 'magnum'
$group = 'magnum'
case $::osfamily {
case $facts['os']['family'] {
'RedHat': {
# package names
$common_package = 'openstack-magnum-common'
@ -34,8 +34,8 @@ class magnum::params {
$wsgi_script_source = '/usr/bin/magnum-api-wsgi'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem")
fail("Unsupported osfamily: ${facts['os']['family']}")
}
} # Case $::osfamily
} # Case $facts['os']['family']
}

16
manifests/policy.pp
View File

@ -6,12 +6,12 @@
#
# [*enforce_scope*]
# (Optional) Whether or not to enforce scope when evaluating policies.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*enforce_new_defaults*]
# (Optional) Whether or not to use old deprecated defaults when evaluating
# policies.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
# [*policies*]
# (Optional) Set of policies to configure for magnum
@ -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 magnum 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 magnum::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/magnum/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,
) {

4
manifests/quota.pp
View File

@ -6,10 +6,10 @@
#
# [*max_clusters_per_project*]
# (optional) Number of clusters allowed per project.
# Defaults to $::os_service_default.
# Defaults to $facts['os_service_default'].
#
class magnum::quota (
$max_clusters_per_project = $::os_service_default
$max_clusters_per_project = $facts['os_service_default']
) {
magnum_config {

8
manifests/wsgi/apache.pp
View File

@ -23,7 +23,7 @@
#
# [*servername*]
# (Optional) The servername for the virtualhost.
# Defaults to $::fqdn
# Defaults to $facts['networking']['fqdn']
#
# [*port*]
# (Optional) The port.
@ -43,7 +43,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.
@ -119,12 +119,12 @@
# class { 'magnum::wsgi::apache': }
#
class magnum::wsgi::apache (
$servername = $::fqdn,
$servername = $facts['networking']['fqdn'],
$port = 9511,
$bind_host = undef,
$path = '/',
$ssl = false,
$workers = $::os_workers,
$workers = $facts['os_workers'],
$ssl_cert = undef,
$ssl_key = undef,
$ssl_chain = undef,

6
manifests/wsgi/uwsgi.pp
View File

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

20
manifests/x509.pp
View File

@ -6,30 +6,30 @@
#
# [*allow_ca*]
# (optional) Certificate can get the CA flag in x509 extensions.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*allowed_extensions*]
# (optional) List of allowed x509 extensions.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*allowed_key_usage*]
# (optional) List of allowed x509 key usage.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*term_of_validity*]
# (optional) Number of days for which a certificate is valid.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
# [*rsa_key_size*]
# (optional) Size of generated private key.
# Defaults to $::os_service_default
# Defaults to $facts['os_service_default']
#
class magnum::x509 (
$allow_ca = $::os_service_default,
$allowed_extensions = $::os_service_default,
$allowed_key_usage = $::os_service_default,
$term_of_validity = $::os_service_default,
$rsa_key_size = $::os_service_default,
$allow_ca = $facts['os_service_default'],
$allowed_extensions = $facts['os_service_default'],
$allowed_key_usage = $facts['os_service_default'],
$term_of_validity = $facts['os_service_default'],
$rsa_key_size = $facts['os_service_default'],
) {
include magnum::deps

2
spec/classes/magnum_api_spec.rb
View File

@ -145,7 +145,7 @@ describe 'magnum::api' do
end
let(:platform_params) do
case facts[:osfamily]
case facts[:os]['family']
when 'Debian'
{ :api_package => 'magnum-api',
:api_service => 'magnum-api' }

2
spec/classes/magnum_client_spec.rb
View File

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

2
spec/classes/magnum_conductor_spec.rb
View File

@ -63,7 +63,7 @@ describe 'magnum::conductor' do
end
let :platform_params do
if facts[:osfamily] == 'Debian'
if facts[:os]['family'] == 'Debian'
{ :conductor_package => 'magnum-conductor',
:conductor_service => 'magnum-conductor' }
else

2
spec/classes/magnum_init_spec.rb
View File

@ -235,7 +235,7 @@ describe 'magnum' do
end
let :platform_params do
if facts[:osfamily] == 'Debian'
if facts[:os]['family'] == 'Debian'
{ :magnum_common_package => 'magnum-common' }
else
{ :magnum_common_package => 'openstack-magnum-common' }

8
spec/classes/magnum_wsgi_apache_spec.rb
View File

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