From d02d2dd1241807d869ec20d77df46abbb005bf01 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 2 Mar 2023 12:31:24 +0900 Subject: [PATCH] Replace legacy facts and use fact hash ... because the latest lint no longer allows usage of legacy facts and top scope fact. Change-Id: I3f17eb12408f4b88bf72f4de31cdf8f8fa008c2a --- manifests/api.pp | 72 +++---- manifests/audit.pp | 12 +- manifests/certificates.pp | 52 ++--- manifests/cinder.pp | 40 ++-- manifests/compute.pp | 16 +- manifests/controller.pp | 208 ++++++++++---------- manifests/cors.pp | 24 +-- manifests/db.pp | 32 +-- manifests/driver_agent.pp | 48 ++--- manifests/glance.pp | 16 +- manifests/health_manager.pp | 36 ++-- manifests/healthcheck.pp | 16 +- manifests/housekeeping.pp | 24 +-- manifests/init.pp | 136 ++++++------- manifests/keystone/authtoken.pp | 112 +++++------ manifests/logging.pp | 72 +++---- manifests/networking.pp | 44 ++--- manifests/neutron.pp | 16 +- manifests/nova.pp | 28 +-- manifests/params.pp | 7 +- manifests/policy.pp | 16 +- manifests/provider/ovn.pp | 44 ++--- manifests/quota.pp | 28 +-- manifests/service_auth.pp | 12 +- manifests/task_flow.pp | 60 +++--- manifests/worker.pp | 4 +- manifests/wsgi/apache.pp | 8 +- manifests/wsgi/uwsgi.pp | 6 +- spec/classes/octavia_api_spec.rb | 2 +- spec/classes/octavia_client_spec.rb | 2 +- spec/classes/octavia_driver_agent_spec.rb | 2 +- spec/classes/octavia_health_manager_spec.rb | 2 +- spec/classes/octavia_housekeeping_spec.rb | 2 +- spec/classes/octavia_init_spec.rb | 2 +- spec/classes/octavia_quota_spec.rb | 2 +- spec/classes/octavia_worker_spec.rb | 2 +- spec/classes/octavia_wsgi_apache_spec.rb | 8 +- 37 files changed, 605 insertions(+), 608 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index 192aa819..526d8ba4 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -37,19 +37,19 @@ # # [*api_handler*] # (optional) The handler that the API communicates with -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*api_v1_enabled*] # (optional) Boolean if V1 API should be enabled. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*api_v2_enabled*] # (optional) Boolean if V2 API should be enabled. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*allow_tls_terminated_listeners*] # (optional) Boolean if we allow creation of TLS terminated listeners. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*sync_db*] # (optional) Run octavia-db-manage upgrade head on api nodes after installing the package. @@ -58,62 +58,62 @@ # [*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']. # # [*default_provider_driver*] # (optional) Configure the default provider driver. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_provider_drivers*] # (optional) Configure the loadbalancer provider drivers. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*pagination_max_limit*] # (optional) The maximum number of items returned in a single response. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*healthcheck_enabled*] # (optional) Enable the oslo middleware healthcheck endpoint. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*healthcheck_refresh_interval*] # (optional) The interval healthcheck plugin should cache results, in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_listener_ciphers*] # (optional) Default OpenSSL cipher string (colon-separated) for new # TLS-enabled pools. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_pool_ciphers*] # (optional) Default OpenSSL cipher string (colon-separated) for new # TLS-enabled pools. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*tls_cipher_prohibit_list*] # (optional) Colon separated list of OpenSSL ciphers. Usage of these ciphers # will be blocked. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_listener_tls_versions*] # (optional) List of TLS versions to use for new TLS-enabled listeners. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_pool_tls_versions*] # (optional) List of TLS versions to use for new TLS-enabled pools. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*minimum_tls_version*] # (optional) Minimum allowed TLS version for listeners and pools. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*allow_ping_health_monitors*] # (optional) Allow PING type Health Monitors. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*allow_prometheus_listeners*] # (optional) Allow PROMETHEUS type listeners. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # DEPRECATED PARAMETERS # @@ -129,25 +129,25 @@ class octavia::api ( $port = '9876', $package_ensure = 'present', $auth_strategy = 'keystone', - $api_handler = $::os_service_default, - $api_v1_enabled = $::os_service_default, - $api_v2_enabled = $::os_service_default, - $allow_tls_terminated_listeners = $::os_service_default, + $api_handler = $facts['os_service_default'], + $api_v1_enabled = $facts['os_service_default'], + $api_v2_enabled = $facts['os_service_default'], + $allow_tls_terminated_listeners = $facts['os_service_default'], $sync_db = false, - $enable_proxy_headers_parsing = $::os_service_default, - $default_provider_driver = $::os_service_default, - $enabled_provider_drivers = $::os_service_default, - $pagination_max_limit = $::os_service_default, - $healthcheck_enabled = $::os_service_default, - $healthcheck_refresh_interval = $::os_service_default, - $default_listener_ciphers = $::os_service_default, - $default_pool_ciphers = $::os_service_default, - $tls_cipher_prohibit_list = $::os_service_default, - $default_listener_tls_versions = $::os_service_default, - $default_pool_tls_versions = $::os_service_default, - $minimum_tls_version = $::os_service_default, - $allow_ping_health_monitors = $::os_service_default, - $allow_prometheus_listeners = $::os_service_default, + $enable_proxy_headers_parsing = $facts['os_service_default'], + $default_provider_driver = $facts['os_service_default'], + $enabled_provider_drivers = $facts['os_service_default'], + $pagination_max_limit = $facts['os_service_default'], + $healthcheck_enabled = $facts['os_service_default'], + $healthcheck_refresh_interval = $facts['os_service_default'], + $default_listener_ciphers = $facts['os_service_default'], + $default_pool_ciphers = $facts['os_service_default'], + $tls_cipher_prohibit_list = $facts['os_service_default'], + $default_listener_tls_versions = $facts['os_service_default'], + $default_pool_tls_versions = $facts['os_service_default'], + $minimum_tls_version = $facts['os_service_default'], + $allow_ping_health_monitors = $facts['os_service_default'], + $allow_prometheus_listeners = $facts['os_service_default'], # DEPRECATED PARAMETERS $provider_drivers = undef, ) inherits octavia::params { diff --git a/manifests/audit.pp b/manifests/audit.pp index 5f31320a..0bc39f5a 100644 --- a/manifests/audit.pp +++ b/manifests/audit.pp @@ -6,21 +6,21 @@ # # [*enabled*] # (Optional) Enable auditing of API requests -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*audit_map_file*] # (Optional) Path to audit map file for octavia-api service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ignore_req_list*] # (Optional) Comma separated list of octavia REST API HTTP methods # to be ignored during audit logging. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::audit ( - $enabled = $::os_service_default, - $audit_map_file = $::os_service_default, - $ignore_req_list = $::os_service_default, + $enabled = $facts['os_service_default'], + $audit_map_file = $facts['os_service_default'], + $ignore_req_list = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/certificates.pp b/manifests/certificates.pp index adb4e2c7..c1520851 100644 --- a/manifests/certificates.pp +++ b/manifests/certificates.pp @@ -6,39 +6,39 @@ # # [*cert_generator*] # (Optional) Certificate generator to use. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*cert_manager*] # (Optional) Certificate manager to use. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*barbican_auth*] # (Optional) Name of the Barbican authentication method to use. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*service_name*] # (Optional) The name of the certificate service in the keystone catalog. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint*] # (Optional) A new endpoint to override the endpoint in the keystone catalog. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (Optional) Region name to use when connecting to cert manager. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_type*] # (Optional) Endpoint type to use when connecting to cert manager. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ca_certificate*] # (Optional) Path to the CA certificate for Octavia -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ca_private_key*] # (Optional) Path for private key used to sign certificates -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*server_certs_key_passphrase*] # (Optional) Passphrase for encrypting Amphora Certificates and Private Keys. @@ -47,15 +47,15 @@ # # [*ca_private_key_passphrase*] # (Optional) CA password used to sign certificates -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*signing_digest*] # (Optional) Certificate signing digest. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*cert_validity_time*] # (Optional) The validity time for the Amphora Certificates (in seconds). -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*client_ca*] # (Optional) Path to the client CA certificate. @@ -65,7 +65,7 @@ # # [*client_cert*] # (Optional) Path for client certificate used to connect to amphorae. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ca_certificate_data*] # (Optional) CA certificate for Octavia @@ -94,21 +94,21 @@ # Defaults to 'octavia' # class octavia::certificates ( - $cert_generator = $::os_service_default, - $cert_manager = $::os_service_default, - $barbican_auth = $::os_service_default, - $service_name = $::os_service_default, - $endpoint = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_type = $::os_service_default, - $ca_certificate = $::os_service_default, - $ca_private_key = $::os_service_default, + $cert_generator = $facts['os_service_default'], + $cert_manager = $facts['os_service_default'], + $barbican_auth = $facts['os_service_default'], + $service_name = $facts['os_service_default'], + $endpoint = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_type = $facts['os_service_default'], + $ca_certificate = $facts['os_service_default'], + $ca_private_key = $facts['os_service_default'], $server_certs_key_passphrase = 'insecure-key-do-not-use-this-key', - $ca_private_key_passphrase = $::os_service_default, - $signing_digest = $::os_service_default, - $cert_validity_time = $::os_service_default, + $ca_private_key_passphrase = $facts['os_service_default'], + $signing_digest = $facts['os_service_default'], + $cert_validity_time = $facts['os_service_default'], $client_ca = undef, - $client_cert = $::os_service_default, + $client_cert = $facts['os_service_default'], $ca_certificate_data = undef, $ca_private_key_data = undef, $client_ca_data = undef, diff --git a/manifests/cinder.pp b/manifests/cinder.pp index eddbb736..e452aa32 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -6,55 +6,55 @@ # # [*service_name*] # (Optional) The name of the cinder service in the keystone catalog. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint*] # (Optional) Custom cinder endpoint if override is necessary. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (Optional) Region in catalog to use for cinder. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_type*] # (Optional) Endpoint type in catalog to use for cinder. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*availability_zone*] # (Optional) Availability zone to use for creating volume. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*volume_size*] # (Optional) Size of volume, in GB, for Amphora instance -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*volume_type*] # (Optional) Type of volume for Amphorae volume root disk -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*volume_create_retry_interval*] # (Optional) Interval time to wait volume is created in available state -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*volume_create_timeout*] # (Optional) Timeout to wait volume is created in available -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*volume_create_max_retries*] # (Optional) Maximum number of retries to create volume -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::cinder ( - $service_name = $::os_service_default, - $endpoint = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_type = $::os_service_default, - $availability_zone = $::os_service_default, - $volume_size = $::os_service_default, - $volume_type = $::os_service_default, - $volume_create_retry_interval = $::os_service_default, - $volume_create_timeout = $::os_service_default, - $volume_create_max_retries = $::os_service_default, + $service_name = $facts['os_service_default'], + $endpoint = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_type = $facts['os_service_default'], + $availability_zone = $facts['os_service_default'], + $volume_size = $facts['os_service_default'], + $volume_type = $facts['os_service_default'], + $volume_create_retry_interval = $facts['os_service_default'], + $volume_create_timeout = $facts['os_service_default'], + $volume_create_max_retries = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/compute.pp b/manifests/compute.pp index 29f47456..ca2993fc 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -7,26 +7,26 @@ # [*max_retries*] # (Optional) The maximum attempts to retry an action with the compute # service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*retry_interval*] # (Optional) Seconds to wait before retrying an action with the compute # service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*retry_backoff*] # (Optional) The seconds to backoff retry attempts. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*retry_max*] # (Optional) The maximum interval in seconds between retry attempts. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::compute ( - $max_retries = $::os_service_default, - $retry_interval = $::os_service_default, - $retry_backoff = $::os_service_default, - $retry_max = $::os_service_default, + $max_retries = $facts['os_service_default'], + $retry_interval = $facts['os_service_default'], + $retry_backoff = $facts['os_service_default'], + $retry_max = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/controller.pp b/manifests/controller.pp index 7dbbf77a..ac4e9d9d 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -8,12 +8,12 @@ # # [*amp_active_retries*] # (optional) Retry attempts to wait for Amphora to become active. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amp_active_wait_sec*] # (optional) Seconds to wait between checks on whether an Amphora has # become active. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amp_flavor_id*] # (optional) Nova instance flavor id for the Amphora. @@ -25,58 +25,58 @@ # Glance image tag for Amphora image. Allows the Amphora image to be # referred to by a tag instead of an ID, allowing the Amphora image to # be updated without requiring reconfiguration of Octavia. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amp_image_owner_id*] # Restrict glance image selection to a specific owner ID. This is a # recommended security setting. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amp_secgroup_list*] # List of security groups to use for Amphorae. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amp_boot_network_list*] # List of networks to attach to Amphorae. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*loadbalancer_topology*] # (optional) Load balancer topology configuration -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amphora_driver*] # (optional) Name of driver for communicating with amphorae -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*compute_driver*] # (optional) Name of driver for managing amphorae VMs -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*network_driver*] # (optional) Name of network driver for configuring networking # for amphorae. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*volume_driver*] # (optional) Name of volume driver for managing amphora volumes -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*image_driver*] # (optional) Name of volume driver for managing amphora image -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amp_timezone*] # (optional) Defines the timezone to use as represented in # /usr/share/zoneinfo. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amphora_delete_retries*] # (optional) Number of times an amphora delete should be retried. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amphora_delete_retry_interval*] # (optional) Time, in seconds, between amphora delete retries. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amp_ssh_key_name*] # (optional) Name of Openstack SSH keypair for communicating with amphora @@ -89,163 +89,163 @@ # # [*timeout_client_data*] # (optional) Frontend client inactivity timeout. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*timeout_member_connect*] # (optional) Backend member connection timeout. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*timeout_member_data*] # (optional) Backend member inactivity timeout.' -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*timeout_tcp_inspect*] # (optional) Time to wait for TCP packets for content inspection. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*connection_max_retries*] # (optional) Maximum number of retries when contacting amphora. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*connection_retry_interval*] # (optional) Number of seconds to wait between connection attempts to amphora. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*active_connection_max_retries*] # (optional) Retry threshold for connecting to active amphorae. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*active_connection_retry_interval*] # (optional) Retry timeout between connection attempts in seconds for active # amphora. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*failover_connection_max_retries*] # (optional) Retry threshold for connecting to an amphora in failover. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*failover_connection_retry_interval*] # (optional) Retry timeout between connection attempts in seconds for amphora # in failover. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*connection_logging*] # (optional) When false, disables logging of tenant connection flows. This # includes storing them locally and sending them to the tenant syslog # endpoints. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*build_rate_limit*] # (optional) Number of amphorae that could be build per controller worker, # simultaneously. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*build_active_retries*] # (optional) Retry threshold for waiting for a build slot for an amphorae. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*build_retry_interval*] # (optional) Retry timeout between build attempts in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_connection_limit*] # (optional) Default connection_limit for listeners. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*agent_request_read_timeout*] # (optional) The time in seconds to allow a request from the controller to # run before terminating the socket. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*agent_tls_protocol*] # (optional) Minimum TLS protocol for communication with the amphora agent. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*admin_log_targets*] # (optional) The list of syslog endpoints, host:port comma separated list, # to receive administrative log messages. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*administrative_log_facility*] # (optional) The syslog "LOG_LOCAL" facility to use for the administrative # log messages. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*forward_all_logs*] # (optional) When true, all log messages from the amphora will be forwarded # to the administrative log endpoints, including non-load balancing related # logs. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*tenant_log_targets*] # (optional) The list of syslog endpoints, host:port comma separated list, # to receive tenant traffic flow log messages. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_log_facility*] # (optional) The syslog "LOG_LOCAL" facility to use for the tenant traffic # flow log messages. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*user_log_format*] # (optional) The tenant traffic flow log format string. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*log_protocol*] # (optional) The log forwarding transport protoocl. One of UDP or TCP. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*log_retry_count*] # (optional) The maximum attempts to retry connecting to the logging host. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*log_retry_interval*] # (optional) The time, in seconds, to wait between retries connecting to # the logging host. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*log_queue_size*] # (optional) The queue size (messages) to buffer log messages. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*logging_template_override*] # (optional) Custom logging configuration template. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*disable_local_log_storage*] # (optional) When true, logs will not be stored on the amphora filesystem. # This includes all kernel, system, and security logs. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*vrrp_advert_int*] # (optional) Amphora role and priority advertisement internal in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*vrrp_check_interval*] # (optional) VRRP health check script run interval in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*vrrp_fail_count*] # (optional) Number of successive failures before transition to a fail rate. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*vrrp_success_count*] # (optional) Number of consecutive successes before transition to a success rate. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*vrrp_garp_refresh_interval*] # (optional) Time in seconds between gratuitous ARP announcements from the MASTER. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*vrrp_garp_refresh_count*] # (optional) Number of gratuitous ARP announcements to make on each refresh interval. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*controller_ip_port_list*] # (optional) The list of controllers in a host:port comma separated # list if multiple. This is added to the amphora config and is used # when it connects back to the controllers to report its health. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*heartbeat_interval*] # (optional) Sleep time between sending heartbeats. @@ -253,61 +253,61 @@ # class octavia::controller ( $heartbeat_key, - $amp_active_retries = $::os_service_default, - $amp_active_wait_sec = $::os_service_default, + $amp_active_retries = $facts['os_service_default'], + $amp_active_wait_sec = $facts['os_service_default'], $amp_flavor_id = '65', - $amp_image_tag = $::os_service_default, - $amp_image_owner_id = $::os_service_default, - $amp_secgroup_list = $::os_service_default, - $amp_boot_network_list = $::os_service_default, - $loadbalancer_topology = $::os_service_default, - $amphora_driver = $::os_service_default, - $compute_driver = $::os_service_default, - $network_driver = $::os_service_default, - $volume_driver = $::os_service_default, - $image_driver = $::os_service_default, - $amp_timezone = $::os_service_default, - $amphora_delete_retries = $::os_service_default, - $amphora_delete_retry_interval = $::os_service_default, + $amp_image_tag = $facts['os_service_default'], + $amp_image_owner_id = $facts['os_service_default'], + $amp_secgroup_list = $facts['os_service_default'], + $amp_boot_network_list = $facts['os_service_default'], + $loadbalancer_topology = $facts['os_service_default'], + $amphora_driver = $facts['os_service_default'], + $compute_driver = $facts['os_service_default'], + $network_driver = $facts['os_service_default'], + $volume_driver = $facts['os_service_default'], + $image_driver = $facts['os_service_default'], + $amp_timezone = $facts['os_service_default'], + $amphora_delete_retries = $facts['os_service_default'], + $amphora_delete_retry_interval = $facts['os_service_default'], $enable_ssh_access = true, $amp_ssh_key_name = 'octavia-ssh-key', - $timeout_client_data = $::os_service_default, - $timeout_member_connect = $::os_service_default, - $timeout_member_data = $::os_service_default, - $timeout_tcp_inspect = $::os_service_default, - $connection_max_retries = $::os_service_default, - $connection_retry_interval = $::os_service_default, - $connection_logging = $::os_service_default, - $active_connection_max_retries = $::os_service_default, - $active_connection_retry_interval = $::os_service_default, - $failover_connection_max_retries = $::os_service_default, - $failover_connection_retry_interval = $::os_service_default, - $build_rate_limit = $::os_service_default, - $build_active_retries = $::os_service_default, - $build_retry_interval = $::os_service_default, - $default_connection_limit = $::os_service_default, - $agent_request_read_timeout = $::os_service_default, - $agent_tls_protocol = $::os_service_default, - $admin_log_targets = $::os_service_default, - $administrative_log_facility = $::os_service_default, - $forward_all_logs = $::os_service_default, - $tenant_log_targets = $::os_service_default, - $user_log_facility = $::os_service_default, - $user_log_format = $::os_service_default, - $log_protocol = $::os_service_default, - $log_retry_count = $::os_service_default, - $log_retry_interval = $::os_service_default, - $log_queue_size = $::os_service_default, - $logging_template_override = $::os_service_default, - $disable_local_log_storage = $::os_service_default, - $vrrp_advert_int = $::os_service_default, - $vrrp_check_interval = $::os_service_default, - $vrrp_fail_count = $::os_service_default, - $vrrp_success_count = $::os_service_default, - $vrrp_garp_refresh_interval = $::os_service_default, - $vrrp_garp_refresh_count = $::os_service_default, - $controller_ip_port_list = $::os_service_default, - $heartbeat_interval = $::os_service_default, + $timeout_client_data = $facts['os_service_default'], + $timeout_member_connect = $facts['os_service_default'], + $timeout_member_data = $facts['os_service_default'], + $timeout_tcp_inspect = $facts['os_service_default'], + $connection_max_retries = $facts['os_service_default'], + $connection_retry_interval = $facts['os_service_default'], + $connection_logging = $facts['os_service_default'], + $active_connection_max_retries = $facts['os_service_default'], + $active_connection_retry_interval = $facts['os_service_default'], + $failover_connection_max_retries = $facts['os_service_default'], + $failover_connection_retry_interval = $facts['os_service_default'], + $build_rate_limit = $facts['os_service_default'], + $build_active_retries = $facts['os_service_default'], + $build_retry_interval = $facts['os_service_default'], + $default_connection_limit = $facts['os_service_default'], + $agent_request_read_timeout = $facts['os_service_default'], + $agent_tls_protocol = $facts['os_service_default'], + $admin_log_targets = $facts['os_service_default'], + $administrative_log_facility = $facts['os_service_default'], + $forward_all_logs = $facts['os_service_default'], + $tenant_log_targets = $facts['os_service_default'], + $user_log_facility = $facts['os_service_default'], + $user_log_format = $facts['os_service_default'], + $log_protocol = $facts['os_service_default'], + $log_retry_count = $facts['os_service_default'], + $log_retry_interval = $facts['os_service_default'], + $log_queue_size = $facts['os_service_default'], + $logging_template_override = $facts['os_service_default'], + $disable_local_log_storage = $facts['os_service_default'], + $vrrp_advert_int = $facts['os_service_default'], + $vrrp_check_interval = $facts['os_service_default'], + $vrrp_fail_count = $facts['os_service_default'], + $vrrp_success_count = $facts['os_service_default'], + $vrrp_garp_refresh_interval = $facts['os_service_default'], + $vrrp_garp_refresh_count = $facts['os_service_default'], + $controller_ip_port_list = $facts['os_service_default'], + $heartbeat_interval = $facts['os_service_default'], ) inherits octavia::params { include octavia::deps @@ -324,7 +324,7 @@ class octavia::controller ( octavia_config { 'controller_worker/amp_ssh_key_name' : value => $amp_ssh_key_name; } } else { - octavia_config { 'controller_worker/amp_ssh_key_name' : value => $::os_service_default } + octavia_config { 'controller_worker/amp_ssh_key_name' : value => $facts['os_service_default'] } } octavia_config { diff --git a/manifests/cors.pp b/manifests/cors.pp index de178bfe..5bc96bca 100644 --- a/manifests/cors.pp +++ b/manifests/cors.pp @@ -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 octavia::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 octavia::deps diff --git a/manifests/db.pp b/manifests/db.pp index 3858d344..0c6bc3ee 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -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 octavia::db ( $database_connection = 'sqlite:////var/lib/octavia/octavia.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 octavia::deps diff --git a/manifests/driver_agent.pp b/manifests/driver_agent.pp index 768de7d3..687b7770 100644 --- a/manifests/driver_agent.pp +++ b/manifests/driver_agent.pp @@ -16,74 +16,74 @@ # # [*status_socket_path*] # (optional) Path to the driver status unix domain socket file. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*stats_socket_path*] # (optional) Path to the driver statistics unix domain socket file. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*get_socket_path*] # (optional) Path to the driver get unix domain socket file. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*status_request_timeout*] # (optional) Time, in seconds, to wait for a status update request. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*status_max_processes*] # (optional) Maximum number of concurrent processes to use servicing status # updates. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*stats_request_timeout*] # (optional) Time, in seconds, to wait for a statistics update request. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*stats_max_processes*] # (optional) Maximum number of concurrent processes to use servicing # statistics updates. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*get_request_timeout*] # (optional) Time, in seconds, to wait for a get request. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*get_max_processes*] # (optional) Maximum number of concurrent processes to use servicing get # requests. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*max_process_warning_percent*] # (optional) Percentage of max_processes (both status and stats) in use to # start logging warning messages about an overloaded driver-agent. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*provider_agent_shutdown_timeout*] # (optional) The time, in seconds, to wait for provider agents to shutdown # after the exit event has been set. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enabled_provider_agents*] # (optional) List of enabled provider agents. The driver-agent will launch # these agents at startup. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::driver_agent ( $manage_service = true, $enabled = true, $package_ensure = 'present', - $status_socket_path = $::os_service_default, - $stats_socket_path = $::os_service_default, - $get_socket_path = $::os_service_default, - $status_request_timeout = $::os_service_default, - $status_max_processes = $::os_service_default, - $stats_request_timeout = $::os_service_default, - $stats_max_processes = $::os_service_default, - $get_request_timeout = $::os_service_default, - $get_max_processes = $::os_service_default, - $max_process_warning_percent = $::os_service_default, - $provider_agent_shutdown_timeout = $::os_service_default, - $enabled_provider_agents = $::os_service_default, + $status_socket_path = $facts['os_service_default'], + $stats_socket_path = $facts['os_service_default'], + $get_socket_path = $facts['os_service_default'], + $status_request_timeout = $facts['os_service_default'], + $status_max_processes = $facts['os_service_default'], + $stats_request_timeout = $facts['os_service_default'], + $stats_max_processes = $facts['os_service_default'], + $get_request_timeout = $facts['os_service_default'], + $get_max_processes = $facts['os_service_default'], + $max_process_warning_percent = $facts['os_service_default'], + $provider_agent_shutdown_timeout = $facts['os_service_default'], + $enabled_provider_agents = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/glance.pp b/manifests/glance.pp index 6f52f1a3..964bb2e4 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -6,25 +6,25 @@ # # [*service_name*] # (Optional) The name of the glance service in the keystone catalog. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint*] # (Optional) Custom glance endpoint if override is necessary. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (Optional) Region in catalog to use for glance. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_type*] # (Optional) Endpoint type in catalog to use for glance. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::glance ( - $service_name = $::os_service_default, - $endpoint = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_type = $::os_service_default, + $service_name = $facts['os_service_default'], + $endpoint = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_type = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/health_manager.pp b/manifests/health_manager.pp index e03b946e..4928c29a 100644 --- a/manifests/health_manager.pp +++ b/manifests/health_manager.pp @@ -16,40 +16,40 @@ # # [*ip*] # (optional) The bind ip for the health manager -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*port*] # (optional) The bind port for the health manager -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*health_update_threads*] # (optional) Number of processes for amphora health update -# Defaults to $::os_workers +# Defaults to $facts['os_workers'] # # [*stats_update_threads*] # (optional) Number of processes for amphora stats update -# Defaults to $::os_workers +# Defaults to $facts['os_workers'] # # [*failover_threads*] # (optional) The number of threads performing amphora failovers. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*heartbeat_timeout*] # (optional) Interval, in seconds, to wait before failing over an amphora. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*health_check_interval*] # (optional) Sleep time between health checks in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*sock_rlimit*] # (optional) Sets the value of the heartbeat recv buffer -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*failover_threshold*] # (optional) Stop failovers if the count of simultaneously failed amphora # reaches this number. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # DEPRECATED PARAMETERS # @@ -61,15 +61,15 @@ class octavia::health_manager ( $manage_service = true, $enabled = true, $package_ensure = 'present', - $ip = $::os_service_default, - $port = $::os_service_default, - $health_update_threads = $::os_workers, - $stats_update_threads = $::os_workers, - $failover_threads = $::os_service_default, - $heartbeat_timeout = $::os_service_default, - $health_check_interval = $::os_service_default, - $sock_rlimit = $::os_service_default, - $failover_threshold = $::os_service_default, + $ip = $facts['os_service_default'], + $port = $facts['os_service_default'], + $health_update_threads = $facts['os_workers'], + $stats_update_threads = $facts['os_workers'], + $failover_threads = $facts['os_service_default'], + $heartbeat_timeout = $facts['os_service_default'], + $health_check_interval = $facts['os_service_default'], + $sock_rlimit = $facts['os_service_default'], + $failover_threshold = $facts['os_service_default'], # DEPRECATED PARAMETERS $workers = undef, ) inherits octavia::params { diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp index 5c113c47..5773a80f 100644 --- a/manifests/healthcheck.pp +++ b/manifests/healthcheck.pp @@ -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 octavia::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 octavia::deps diff --git a/manifests/housekeeping.pp b/manifests/housekeeping.pp index c8f168ae..183a9d5a 100644 --- a/manifests/housekeeping.pp +++ b/manifests/housekeeping.pp @@ -16,38 +16,38 @@ # # [*cleanup_interval*] # (optional) DB cleanup interval in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*amphora_expiry_age*] # (optional) Amphora expiry age in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*load_balancer_expiry_age*] # (optional) Load balancer expiry age in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*cert_interval*] # (optional) Certificate check interval in seconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*cert_expiry_buffer*] # (optional) Seconds until certificate expiry. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*cert_rotate_threads*] # (optional) Number of threads performing amphora certificate rotation. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::housekeeping ( $manage_service = true, $enabled = true, $package_ensure = 'present', - $cleanup_interval = $::os_service_default, - $amphora_expiry_age = $::os_service_default, - $load_balancer_expiry_age = $::os_service_default, - $cert_interval = $::os_service_default, - $cert_expiry_buffer = $::os_service_default, - $cert_rotate_threads = $::os_service_default, + $cleanup_interval = $facts['os_service_default'], + $amphora_expiry_age = $facts['os_service_default'], + $load_balancer_expiry_age = $facts['os_service_default'], + $cert_interval = $facts['os_service_default'], + $cert_expiry_buffer = $facts['os_service_default'], + $cert_rotate_threads = $facts['os_service_default'], ) inherits octavia::params { include octavia::deps diff --git a/manifests/init.pp b/manifests/init.pp index 4cbbb710..71689709 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -12,25 +12,25 @@ # (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_use_ssl*] # (optional) Connect over SSL for RabbitMQ -# 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 @@ -38,14 +38,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 @@ -55,121 +55,121 @@ # 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'] # # [*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'] # # [*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) Define queues as "durable" to rabbitmq. -# 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']. # # [*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'] # # [*topic*] # Messaging topic for controller-worker RPC communication. @@ -182,40 +182,40 @@ # class octavia ( $package_ensure = 'present', - $default_transport_url = $::os_service_default, - $rpc_response_timeout = $::os_service_default, - $control_exchange = $::os_service_default, - $rabbit_use_ssl = $::os_service_default, - $rabbit_heartbeat_timeout_threshold = $::os_service_default, - $rabbit_heartbeat_rate = $::os_service_default, - $rabbit_heartbeat_in_pthread = $::os_service_default, - $rabbit_ha_queues = $::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 = $::os_service_default, - $notification_driver = $::os_service_default, - $notification_topics = $::os_service_default, + $default_transport_url = $facts['os_service_default'], + $rpc_response_timeout = $facts['os_service_default'], + $control_exchange = $facts['os_service_default'], + $rabbit_use_ssl = $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_ha_queues = $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'], + $notification_transport_url = $facts['os_service_default'], + $notification_driver = $facts['os_service_default'], + $notification_topics = $facts['os_service_default'], $topic = 'octavia-rpc', $purge_config = false, ) inherits octavia::params { diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 1facd1fa..04cc74e7 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -29,17 +29,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 @@ -51,26 +51,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 @@ -80,57 +80,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 @@ -138,17 +138,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. @@ -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,23 +172,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 @@ -201,37 +201,37 @@ class octavia::keystone::authtoken( $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 = {}, ) { diff --git a/manifests/logging.pp b/manifests/logging.pp index 4b3dbd07..4ac420d9 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -6,31 +6,31 @@ # # [*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 $::os_service_default, it will not log to any directory. +# If set to $facts['os_service_default'], it will not log to any directory. # Defaults to '/var/log/octavia'. # # [*log_file*] @@ -39,38 +39,38 @@ # # [*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,11 +82,11 @@ # # [*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 @@ -97,35 +97,35 @@ # [*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 octavia::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/octavia', $log_file = '/var/log/octavia/octavia.log', - $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, + $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 octavia::deps diff --git a/manifests/networking.pp b/manifests/networking.pp index b12e3f62..26ce6a74 100644 --- a/manifests/networking.pp +++ b/manifests/networking.pp @@ -7,63 +7,63 @@ # [*max_retries*] # (Optional) The maximum attempts to retry an action with the networking # service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*retry_interval*] # (Optional) Seconds to wait before retrying an action with the networking # service. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*retry_backoff*] # (Optional) The seconds to backoff retry attempts. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*retry_max*] # (Optional) The maximum interval in seconds between retry attempts. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*port_detach_timeout*] # (Optional) Seconds to wait for a port to detach from an amphora. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*allow_vip_network_id*] # (Optional) Can users supply a network_id for their VIP? -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*allow_vip_subnet_id*] # (Optional) Can users supply a subnet_id for their VIP? -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*allow_vip_port_id*] # (Optional) Can users supply a port_id for their VIP? -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*valid_vip_networks*] # (Optional) List of network_ids that are valid for VIP creation. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*reserved_ips*] # (Optional) List of IP addresses reserved from being used for member # addresses. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*allow_invisible_resource_usage*] # (Optional) When True, users can use network resources they cannot normally # see as VIP or member subnets. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::networking ( - $max_retries = $::os_service_default, - $retry_interval = $::os_service_default, - $retry_backoff = $::os_service_default, - $retry_max = $::os_service_default, - $port_detach_timeout = $::os_service_default, - $allow_vip_network_id = $::os_service_default, - $allow_vip_subnet_id = $::os_service_default, - $allow_vip_port_id = $::os_service_default, - $valid_vip_networks = $::os_service_default, - $reserved_ips = $::os_service_default, - $allow_invisible_resource_usage = $::os_service_default, + $max_retries = $facts['os_service_default'], + $retry_interval = $facts['os_service_default'], + $retry_backoff = $facts['os_service_default'], + $retry_max = $facts['os_service_default'], + $port_detach_timeout = $facts['os_service_default'], + $allow_vip_network_id = $facts['os_service_default'], + $allow_vip_subnet_id = $facts['os_service_default'], + $allow_vip_port_id = $facts['os_service_default'], + $valid_vip_networks = $facts['os_service_default'], + $reserved_ips = $facts['os_service_default'], + $allow_invisible_resource_usage = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/neutron.pp b/manifests/neutron.pp index eed3f3e0..ad705744 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -6,25 +6,25 @@ # # [*service_name*] # (Optional) The name of the neutron service in the keystone catalog. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint*] # (Optional) Custom neutron endpoint if override is necessary. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (Optional) Region in catalog to use for neutron. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_type*] # (Optional) Endpoint type in catalog to use for neutron. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::neutron ( - $service_name = $::os_service_default, - $endpoint = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_type = $::os_service_default, + $service_name = $facts['os_service_default'], + $endpoint = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_type = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/nova.pp b/manifests/nova.pp index 2a97f5e2..ef6b2bb9 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -6,41 +6,41 @@ # # [*service_name*] # (Optional) The name of the nova service in the keystone catalog. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint*] # (Optional) Custom nova endpoint if override is necessary. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*region_name*] # (Optional) Region in catalog to use for nova. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*endpoint_type*] # (Optional) Endpoint type in catalog to use for nova. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*availability_zone*] # (Optional) Availability zone to use for creating Amphorae. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*enable_anti_affinity*] # (Optional) Enable anti-affinity in nova. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*anti_affinity_policy*] # (Optional) Set the anti-affinity policy to what is suitable. # Nova supports: anti-affinity and soft-anti-affinity. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::nova ( - $service_name = $::os_service_default, - $endpoint = $::os_service_default, - $region_name = $::os_service_default, - $endpoint_type = $::os_service_default, - $availability_zone = $::os_service_default, - $enable_anti_affinity = $::os_service_default, - $anti_affinity_policy = $::os_service_default, + $service_name = $facts['os_service_default'], + $endpoint = $facts['os_service_default'], + $region_name = $facts['os_service_default'], + $endpoint_type = $facts['os_service_default'], + $availability_zone = $facts['os_service_default'], + $enable_anti_affinity = $facts['os_service_default'], + $anti_affinity_policy = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/params.pp b/manifests/params.pp index 641499ee..8542f46a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -13,7 +13,7 @@ class octavia::params { $user = 'octavia' $group = 'octavia' - case $::osfamily { + case $facts['os']['family'] { 'RedHat': { $common_package_name = 'openstack-octavia-common' $api_package_name = 'openstack-octavia-api' @@ -35,9 +35,8 @@ class octavia::params { $octavia_wsgi_script_source = '/usr/bin/octavia-wsgi' } default: { - fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \ -module ${module_name} only support osfamily RedHat and Debian") + fail("Unsupported osfamily: ${facts['os']['family']}") } - } # Case $::osfamily + } # Case $facts['os']['family'] } diff --git a/manifests/policy.pp b/manifests/policy.pp index f7883722..34d8637f 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -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 octavia @@ -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 octavia 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 octavia::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/octavia/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, ) { diff --git a/manifests/provider/ovn.pp b/manifests/provider/ovn.pp index 1a38d5f1..7861019c 100644 --- a/manifests/provider/ovn.pp +++ b/manifests/provider/ovn.pp @@ -8,66 +8,66 @@ # # [*ovn_nb_connection*] # (optional) The connection string for the OVN_Northbound OVSDB. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ovn_nb_private_key*] # (optional) The PEM file with private key for SSL connection to OVN-NB-DB -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ovn_nb_certificate*] # (optional) The PEM file with certificate that certifies the private # key specified in ovn_nb_private_key -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ovn_nb_ca_cert*] # (optional) The PEM file with CA certificate that OVN should use to # verify certificates presented to it by SSL peers -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ovn_sb_connection*] # (optional) The connection string for the OVN_Southbound OVSDB. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ovn_sb_private_key*] # (optional) The PEM file with private key for SSL connection to OVN-SB-DB -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ovn_sb_certificate*] # (optional) The PEM file with certificate that certifies the private # key specified in ovn_sb_private_key -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ovn_sb_ca_cert*] # (optional) The PEM file with CA certificate that OVN should use to # verify certificates presented to it by SSL peers -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ovsdb_connection_timeout*] # (optional) Timeout in seconds for the OVSDB connection transaction. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ovsdb_retry_max_interval*] # (optional) Max interval in seconds between each retry to get the OVN NB and # SB IDLs. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*ovsdb_probe_interval*] # (optional) The probe interval for the OVSDB session in milliseconds. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::provider::ovn ( $package_ensure = 'present', - $ovn_nb_connection = $::os_service_default, - $ovn_nb_private_key = $::os_service_default, - $ovn_nb_certificate = $::os_service_default, - $ovn_nb_ca_cert = $::os_service_default, - $ovn_sb_connection = $::os_service_default, - $ovn_sb_private_key = $::os_service_default, - $ovn_sb_certificate = $::os_service_default, - $ovn_sb_ca_cert = $::os_service_default, - $ovsdb_connection_timeout = $::os_service_default, - $ovsdb_retry_max_interval = $::os_service_default, - $ovsdb_probe_interval = $::os_service_default, + $ovn_nb_connection = $facts['os_service_default'], + $ovn_nb_private_key = $facts['os_service_default'], + $ovn_nb_certificate = $facts['os_service_default'], + $ovn_nb_ca_cert = $facts['os_service_default'], + $ovn_sb_connection = $facts['os_service_default'], + $ovn_sb_private_key = $facts['os_service_default'], + $ovn_sb_certificate = $facts['os_service_default'], + $ovn_sb_ca_cert = $facts['os_service_default'], + $ovsdb_connection_timeout = $facts['os_service_default'], + $ovsdb_retry_max_interval = $facts['os_service_default'], + $ovsdb_probe_interval = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/quota.pp b/manifests/quota.pp index 2861ecdb..3d016608 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -6,40 +6,40 @@ # # [*default_load_balancer_quota*] # (optional) Default per project load balancer quota -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_listener_quota*] # (optional) Default per project listener quota. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_member_quota*] # (optional) Default per project member quota. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_pool_quota*] # (optional) Default per project pool quota. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_health_monitor_quota*] # (optional) Default per project health monitor quota. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_l7policy_quota*] # (optional) Default per project l7policy quota. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*default_l7rule_quota*] # (optional) Default per project l7rule quota. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::quota ( - $default_load_balancer_quota = $::os_service_default, - $default_listener_quota = $::os_service_default, - $default_member_quota = $::os_service_default, - $default_pool_quota = $::os_service_default, - $default_health_monitor_quota = $::os_service_default, - $default_l7policy_quota = $::os_service_default, - $default_l7rule_quota = $::os_service_default, + $default_load_balancer_quota = $facts['os_service_default'], + $default_listener_quota = $facts['os_service_default'], + $default_member_quota = $facts['os_service_default'], + $default_pool_quota = $facts['os_service_default'], + $default_health_monitor_quota = $facts['os_service_default'], + $default_l7policy_quota = $facts['os_service_default'], + $default_l7rule_quota = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/service_auth.pp b/manifests/service_auth.pp index a20c59cb..5ca3a0e3 100644 --- a/manifests/service_auth.pp +++ b/manifests/service_auth.pp @@ -28,7 +28,7 @@ # # [*system_scope*] # (Optional) Scope for system operations. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*auth_type*] # (Optional) keystone authentication type @@ -36,7 +36,7 @@ # # [*region_name*] # (Optional) The region in which the identity server can be found. -# Defaults to $::os_service_default. +# Defaults to $facts['os_service_default']. # class octavia::service_auth ( $password, @@ -45,9 +45,9 @@ class octavia::service_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', - $region_name = $::os_service_default, + $region_name = $facts['os_service_default'], ) { include octavia::deps @@ -56,8 +56,8 @@ class octavia::service_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'] } octavia_config { diff --git a/manifests/task_flow.pp b/manifests/task_flow.pp index 3eed5280..8846f526 100644 --- a/manifests/task_flow.pp +++ b/manifests/task_flow.pp @@ -6,81 +6,81 @@ # # [*engine*] # (optional) TaskFlow engine to use. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*max_workers*] # (optional) The maximum number of workers. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*disable_revert*] # (optional) If True, disable the controller worker taskflow flows from # reverting. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_enabled*] # (optional) Enable the jobboard feature in taskflow. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_backend_driver*] # (optional) Jobboard backend driver that will monitor job state. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_backend_hosts*] # (optional) IP addresses of the redis backend for jobboard. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_backend_port*] # (optional) The port of jobboard backend server. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_backend_password*] # (optional) Password for the jobboard backend server. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_backend_namespace*] # (optional) The name used for the job id on the backend server. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_redis_sentinel*] # (optional) Sentinel name if it is used for Redis. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_redis_backend_ssl_options*] # (optional) Redis jobboard backend ssl configuration options -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_zookeeper_ssl_options*] # (optional) Zookeeper jobboard backend ssl configuration options. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_expiration_time*] # (optional) Expiration time in seconds for jobboard tasks. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*jobboard_save_logbook*] # (optional) Save logbook info. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # # [*persistence_connection*] # (optional) Url used to connect to the persistence database. -# Defaults to $::os_service_default +# Defaults to $facts['os_service_default'] # class octavia::task_flow ( - $engine = $::os_service_default, - $max_workers = $::os_service_default, - $disable_revert = $::os_service_default, - $jobboard_enabled = $::os_service_default, - $jobboard_backend_driver = $::os_service_default, - $jobboard_backend_hosts = $::os_service_default, - $jobboard_backend_port = $::os_service_default, - $jobboard_backend_password = $::os_service_default, - $jobboard_backend_namespace = $::os_service_default, - $jobboard_redis_sentinel = $::os_service_default, - $jobboard_redis_backend_ssl_options = $::os_service_default, - $jobboard_zookeeper_ssl_options = $::os_service_default, - $jobboard_expiration_time = $::os_service_default, - $jobboard_save_logbook = $::os_service_default, - $persistence_connection = $::os_service_default, + $engine = $facts['os_service_default'], + $max_workers = $facts['os_service_default'], + $disable_revert = $facts['os_service_default'], + $jobboard_enabled = $facts['os_service_default'], + $jobboard_backend_driver = $facts['os_service_default'], + $jobboard_backend_hosts = $facts['os_service_default'], + $jobboard_backend_port = $facts['os_service_default'], + $jobboard_backend_password = $facts['os_service_default'], + $jobboard_backend_namespace = $facts['os_service_default'], + $jobboard_redis_sentinel = $facts['os_service_default'], + $jobboard_redis_backend_ssl_options = $facts['os_service_default'], + $jobboard_zookeeper_ssl_options = $facts['os_service_default'], + $jobboard_expiration_time = $facts['os_service_default'], + $jobboard_save_logbook = $facts['os_service_default'], + $persistence_connection = $facts['os_service_default'], ) { include octavia::deps diff --git a/manifests/worker.pp b/manifests/worker.pp index 2d1e37bf..5000e7cc 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -16,7 +16,7 @@ # # [*workers*] # (optional) Number of worker processes. -# Defaults to $::os_workers +# Defaults to $facts['os_workers'] # # [*manage_nova_flavor*] # (optional) Whether or not manage Nova flavor for the Amphora. @@ -55,7 +55,7 @@ class octavia::worker ( $manage_service = true, $enabled = true, $package_ensure = 'present', - $workers = $::os_workers, + $workers = $facts['os_workers'], $manage_nova_flavor = true, $nova_flavor_config = {}, $key_path = '/etc/octavia/.ssh/octavia_ssh_key', diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 317e6df2..e487132c 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -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. @@ -132,12 +132,12 @@ # class { 'octavia::wsgi::apache': } # class octavia::wsgi::apache ( - $servername = $::fqdn, + $servername = $facts['networking']['fqdn'], $port = 9876, $bind_host = undef, $path = '/', $ssl = false, - $workers = $::os_workers, + $workers = $facts['os_workers'], $ssl_cert = undef, $ssl_key = undef, $ssl_chain = undef, diff --git a/manifests/wsgi/uwsgi.pp b/manifests/wsgi/uwsgi.pp index cfaaebd4..218cf653 100644 --- a/manifests/wsgi/uwsgi.pp +++ b/manifests/wsgi/uwsgi.pp @@ -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 octavia::wsgi::uwsgi ( - $processes = $::os_workers, + $processes = $facts['os_workers'], $threads = 32, $listen_queue_size = 100, ){ include octavia::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.') } diff --git a/spec/classes/octavia_api_spec.rb b/spec/classes/octavia_api_spec.rb index 47a07b91..ad17b67f 100644 --- a/spec/classes/octavia_api_spec.rb +++ b/spec/classes/octavia_api_spec.rb @@ -270,7 +270,7 @@ describe 'octavia::api' do facts.merge!(OSDefaults.get_facts()) end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :api_package_name => 'octavia-api', :api_service_name => 'octavia-api' } diff --git a/spec/classes/octavia_client_spec.rb b/spec/classes/octavia_client_spec.rb index 1308972d..70ccb9ee 100644 --- a/spec/classes/octavia_client_spec.rb +++ b/spec/classes/octavia_client_spec.rb @@ -38,7 +38,7 @@ describe 'octavia::client' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :client_package_name => 'python3-octaviaclient' } when 'RedHat' diff --git a/spec/classes/octavia_driver_agent_spec.rb b/spec/classes/octavia_driver_agent_spec.rb index 044478d5..52379e79 100644 --- a/spec/classes/octavia_driver_agent_spec.rb +++ b/spec/classes/octavia_driver_agent_spec.rb @@ -80,7 +80,7 @@ describe 'octavia::driver_agent' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :driver_agent_package_name => 'octavia-driver-agent', :driver_agent_service_name => 'octavia-driver-agent' } diff --git a/spec/classes/octavia_health_manager_spec.rb b/spec/classes/octavia_health_manager_spec.rb index 460aedb7..b0ce6af7 100644 --- a/spec/classes/octavia_health_manager_spec.rb +++ b/spec/classes/octavia_health_manager_spec.rb @@ -113,7 +113,7 @@ describe 'octavia::health_manager' do facts.merge!(OSDefaults.get_facts({ :os_workers => 4 })) end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :health_manager_package_name => 'octavia-health-manager', :health_manager_service_name => 'octavia-health-manager' } diff --git a/spec/classes/octavia_housekeeping_spec.rb b/spec/classes/octavia_housekeeping_spec.rb index 5abb864a..0db02888 100644 --- a/spec/classes/octavia_housekeeping_spec.rb +++ b/spec/classes/octavia_housekeeping_spec.rb @@ -88,7 +88,7 @@ describe 'octavia::housekeeping' do facts.merge!(OSDefaults.get_facts()) end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :housekeeping_package_name => 'octavia-housekeeping', :housekeeping_service_name => 'octavia-housekeeping' } diff --git a/spec/classes/octavia_init_spec.rb b/spec/classes/octavia_init_spec.rb index e0325deb..5215a4dc 100644 --- a/spec/classes/octavia_init_spec.rb +++ b/spec/classes/octavia_init_spec.rb @@ -227,7 +227,7 @@ describe 'octavia' do end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :octavia_common_package => 'octavia-common' } when 'RedHat' diff --git a/spec/classes/octavia_quota_spec.rb b/spec/classes/octavia_quota_spec.rb index 75a7a0fb..fd31cde2 100644 --- a/spec/classes/octavia_quota_spec.rb +++ b/spec/classes/octavia_quota_spec.rb @@ -63,7 +63,7 @@ describe 'octavia::quota' 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 'octavia quota' diff --git a/spec/classes/octavia_worker_spec.rb b/spec/classes/octavia_worker_spec.rb index 598fee9d..4e00e98a 100644 --- a/spec/classes/octavia_worker_spec.rb +++ b/spec/classes/octavia_worker_spec.rb @@ -209,7 +209,7 @@ describe 'octavia::worker' do facts.merge!(OSDefaults.get_facts({:os_workers => 4})) end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :worker_package_name => 'octavia-worker', :worker_service_name => 'octavia-worker' } diff --git a/spec/classes/octavia_wsgi_apache_spec.rb b/spec/classes/octavia_wsgi_apache_spec.rb index e08aa074..57dc9b39 100644 --- a/spec/classes/octavia_wsgi_apache_spec.rb +++ b/spec/classes/octavia_wsgi_apache_spec.rb @@ -10,7 +10,7 @@ describe 'octavia::wsgi::apache' do :group => 'octavia', :path => '/', :priority => 10, - :servername => facts[:fqdn], + :servername => 'foo.example.com', :ssl => false, :threads => 1, :user => 'octavia', @@ -147,14 +147,12 @@ describe 'octavia::wsgi::apache' do context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts({ - :os_workers => 42, - :concat_basedir => '/var/lib/puppet/concat', - :fqdn => 'some.host.tld', + :os_workers => 42, })) end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :wsgi_script_path => '/usr/lib/cgi-bin/octavia',