diff -Nru puppet-module-octavia-21.0.0/debian/changelog puppet-module-octavia-22.0.0/debian/changelog --- puppet-module-octavia-21.0.0/debian/changelog 2022-10-20 21:29:39.000000000 +0000 +++ puppet-module-octavia-22.0.0/debian/changelog 2023-06-20 09:26:55.000000000 +0000 @@ -1,3 +1,16 @@ +puppet-module-octavia (22.0.0-2) unstable; urgency=medium + + * Upload to unstable. + + -- Thomas Goirand Tue, 20 Jun 2023 11:26:55 +0200 + +puppet-module-octavia (22.0.0-1) experimental; urgency=medium + + * New upstream release. + * Fixed runtime depends versions for this release. + + -- Thomas Goirand Wed, 12 Apr 2023 11:12:17 +0200 + puppet-module-octavia (21.0.0-1) unstable; urgency=medium * New upstream release. diff -Nru puppet-module-octavia-21.0.0/debian/control puppet-module-octavia-22.0.0/debian/control --- puppet-module-octavia-21.0.0/debian/control 2022-10-20 21:29:39.000000000 +0000 +++ puppet-module-octavia-22.0.0/debian/control 2023-06-20 09:26:55.000000000 +0000 @@ -19,10 +19,10 @@ Architecture: all Depends: puppet, - puppet-module-keystone (>= 21.0.0), - puppet-module-nova (>= 21.0.0), - puppet-module-openstacklib (>= 21.0.0), - puppet-module-oslo (>= 21.0.0), + puppet-module-keystone (>= 22.0.0), + puppet-module-nova (>= 22.0.0), + puppet-module-openstacklib (>= 22.0.0), + puppet-module-oslo (>= 22.0.0), puppet-module-puppetlabs-inifile, puppet-module-puppetlabs-stdlib, puppet-module-voxpupuli-ssh-keygen, diff -Nru puppet-module-octavia-21.0.0/manifests/api.pp puppet-module-octavia-22.0.0/manifests/api.pp --- puppet-module-octavia-21.0.0/manifests/api.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/api.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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,58 +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 $facts['os_service_default'] # # DEPRECATED PARAMETERS # @@ -125,24 +129,25 @@ $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, + $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 { @@ -151,6 +156,10 @@ include octavia::policy include octavia::db + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) + validate_legacy(Boolean, 'validate_bool', $sync_db) + if $provider_drivers != undef { warning('The provider_drivers parameter is deprecated. \ Use the enabled_provider_drivers parameter instead.') @@ -191,6 +200,9 @@ } Service['octavia-api'] -> Service[$service_name] Service<| title == 'httpd' |> { tag +> ['octavia-service', 'octavia-db-sync-service'] } + } else { + fail("Invalid service_name. Either octavia-api/openstack-octavia-api for \ +running as a standalone service, or httpd for being run by a httpd server") } } @@ -225,6 +237,7 @@ 'api_settings/default_pool_tls_versions': value => join(any2array($default_pool_tls_versions), ','); 'api_settings/minimum_tls_version': value => $minimum_tls_version; 'api_settings/allow_ping_health_monitors': value => $allow_ping_health_monitors; + 'api_settings/allow_prometheus_listeners': value => $allow_prometheus_listeners; } oslo::middleware { 'octavia_config': diff -Nru puppet-module-octavia-21.0.0/manifests/audit.pp puppet-module-octavia-22.0.0/manifests/audit.pp --- puppet-module-octavia-21.0.0/manifests/audit.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/audit.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/certificates.pp puppet-module-octavia-22.0.0/manifests/certificates.pp --- puppet-module-octavia-21.0.0/manifests/certificates.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/certificates.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/cinder.pp puppet-module-octavia-22.0.0/manifests/cinder.pp --- puppet-module-octavia-21.0.0/manifests/cinder.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/cinder.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/compute.pp puppet-module-octavia-22.0.0/manifests/compute.pp --- puppet-module-octavia-21.0.0/manifests/compute.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/compute.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/controller.pp puppet-module-octavia-22.0.0/manifests/controller.pp --- puppet-module-octavia-21.0.0/manifests/controller.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/controller.pp 2023-03-24 05:45:59.000000000 +0000 @@ -2,14 +2,18 @@ # # === Parameters # +# [*heartbeat_key*] +# (required) Key to validate amphora messages. +# Defaults to undef +# # [*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. @@ -21,50 +25,62 @@ # 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. -# Default is $::os_service_default +# Defaults to $facts['os_service_default'] +# +# [*amphora_delete_retries*] +# (optional) Number of times an amphora delete should be retried. +# Defaults to $facts['os_service_default'] +# +# [*amphora_delete_retry_interval*] +# (optional) Time, in seconds, between amphora delete retries. +# Defaults to $facts['os_service_default'] +# +# [*event_notifications*] +# (optional) Enable octavia event notifications. +# Defaults to $facts['os_service_default'] # # [*amp_ssh_key_name*] # (optional) Name of Openstack SSH keypair for communicating with amphora @@ -77,247 +93,233 @@ # # [*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 -# -# [*heartbeat_key*] -# (optional) Key to validate amphora messages. -# Defaults to undef +# Defaults to $facts['os_service_default'] # # [*heartbeat_interval*] # (optional) Sleep time between sending heartbeats. # Defaults to undef # -# DEPRECATED PARAMETERS -# -# [*port_detach_timeout*] -# (optional) Seconds to wait for a port to detach from an amphora. -# Defaults to undef -# class octavia::controller ( - $amp_active_retries = $::os_service_default, - $amp_active_wait_sec = $::os_service_default, + $heartbeat_key, + $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, + $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'], + $event_notifications = $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, - # TODO(tkainam): Make this parameter required when we remove - # health_manager::heartbeat_key - $heartbeat_key = undef, - $heartbeat_interval = undef, - # DEPRECATED PARAMETERS - $port_detach_timeout = undef, + $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 include octavia::db - if $port_detach_timeout != undef { - warning('The octavia::controller::port_detach_timeout parameter is deprecated. \ -Use the octavia::networking class instead') - } - include octavia::networking + validate_legacy(String, 'validate_string', $heartbeat_key) + validate_legacy(Boolean, 'validate_bool', $enable_ssh_access) if ! is_service_default($loadbalancer_topology) and ! ($loadbalancer_topology in ['SINGLE', 'ACTIVE_STANDBY']) { @@ -328,7 +330,7 @@ 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 { @@ -346,6 +348,9 @@ 'controller_worker/volume_driver' : value => $volume_driver; 'controller_worker/image_driver' : value => $image_driver; 'controller_worker/amp_timezone' : value => $amp_timezone; + 'controller_worker/amphora_delete_retries' : value => $amphora_delete_retries; + 'controller_worker/amphora_delete_retry_interval' : value => $amphora_delete_retry_interval; + 'controller_worker/event_notifications' : value => $event_notifications; 'haproxy_amphora/timeout_client_data' : value => $timeout_client_data; 'haproxy_amphora/timeout_member_connect' : value => $timeout_member_connect; 'haproxy_amphora/timeout_member_data' : value => $timeout_member_data; @@ -382,18 +387,7 @@ 'keepalived_vrrp/vrrp_garp_refresh_interval' : value => $vrrp_garp_refresh_interval; 'keepalived_vrrp/vrrp_garp_refresh_count' : value => $vrrp_garp_refresh_count; 'health_manager/controller_ip_port_list' : value => join(any2array($controller_ip_port_list), ','); - } - - # TODO(tkajinam): Remove these if-condition when octavia::health_manager - # parameters are removed. - if $heartbeat_key != undef { - octavia_config{ - 'health_manager/heartbeat_key' : value => $heartbeat_key, secret => true; - } - } - if $heartbeat_interval != undef { - octavia_config{ - 'health_manager/heartbeat_interval' : value => $heartbeat_interval; - } + 'health_manager/heartbeat_key' : value => $heartbeat_key, secret => true; + 'health_manager/heartbeat_interval' : value => $heartbeat_interval; } } diff -Nru puppet-module-octavia-21.0.0/manifests/cors.pp puppet-module-octavia-22.0.0/manifests/cors.pp --- puppet-module-octavia-21.0.0/manifests/cors.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/cors.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/db.pp puppet-module-octavia-22.0.0/manifests/db.pp --- puppet-module-octavia-21.0.0/manifests/db.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/db.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/driver_agent.pp puppet-module-octavia-22.0.0/manifests/driver_agent.pp --- puppet-module-octavia-21.0.0/manifests/driver_agent.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/driver_agent.pp 2023-03-24 05:45:59.000000000 +0000 @@ -16,79 +16,82 @@ # # [*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 include octavia::params + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) + package { 'octavia-driver-agent': ensure => $package_ensure, name => $::octavia::params::driver_agent_package_name, diff -Nru puppet-module-octavia-21.0.0/manifests/glance.pp puppet-module-octavia-22.0.0/manifests/glance.pp --- puppet-module-octavia-21.0.0/manifests/glance.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/glance.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/healthcheck.pp puppet-module-octavia-22.0.0/manifests/healthcheck.pp --- puppet-module-octavia-21.0.0/manifests/healthcheck.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/healthcheck.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/health_manager.pp puppet-module-octavia-22.0.0/manifests/health_manager.pp --- puppet-module-octavia-21.0.0/manifests/health_manager.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/health_manager.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 # @@ -57,43 +57,29 @@ # (optional) The number of workers health_manager spawns # Defaults to undef # -# [*heartbeat_key*] -# (optional) Key to validate amphora messages. -# Defaults to undef -# -# [*heartbeat_interval*] -# (optional) Sleep time between sending heartbeats. -# Defaults to undef -# 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, - $heartbeat_key = undef, - $heartbeat_interval = undef, -) inherits octavia::params { +) { include octavia::deps + include octavia::params include octavia::controller - if $heartbeat_key != undef { - warning('The heartbeat_key parameter is deprecated. Use the octavia::controller class parameter instead.') - validate_legacy(String, 'validate_string', $heartbeat_key) - } - if $heartbeat_interval != undef { - warning('The heartbeat_interval parameter is deprecated. Use the octavia::controller class parameter instead.') - } + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) package { 'octavia-health-manager': ensure => $package_ensure, @@ -136,18 +122,4 @@ 'health_manager/sock_rlimit' : value => $sock_rlimit; 'health_manager/failover_threshold' : value => $failover_threshold; } - - if $::octavia::controller::heartbeat_key == undef { - if $heartbeat_key == undef { - fail('The heartbeat_key parameter is required.') - } - octavia_config { - 'health_manager/heartbeat_key': value => $heartbeat_key, secret => true; - } - } - if $::octavia::controller::heartbeat_interval == undef { - octavia_config { - 'health_manager/heartbeat_interval': value => pick($heartbeat_interval, $::os_service_default); - } - } } diff -Nru puppet-module-octavia-21.0.0/manifests/housekeeping.pp puppet-module-octavia-22.0.0/manifests/housekeeping.pp --- puppet-module-octavia-21.0.0/manifests/housekeeping.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/housekeeping.pp 2023-03-24 05:45:59.000000000 +0000 @@ -16,41 +16,45 @@ # # [*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, -) inherits octavia::params { + $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'], +) { include octavia::deps + include octavia::params + + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) package { 'octavia-housekeeping': ensure => $package_ensure, diff -Nru puppet-module-octavia-21.0.0/manifests/init.pp puppet-module-octavia-22.0.0/manifests/init.pp --- puppet-module-octavia-21.0.0/manifests/init.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/init.pp 2023-03-24 05:45:59.000000000 +0000 @@ -12,25 +12,29 @@ # (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'] +# +# [*executor_thread_pool_size*] +# (Optional) Size of executor thread pool when executor is threading or eventlet. +# 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 +42,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 +59,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 +186,41 @@ # 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'], + $executor_thread_pool_size = $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 { @@ -268,9 +273,10 @@ } oslo::messaging::default { 'octavia_config': - transport_url => $default_transport_url, - rpc_response_timeout => $rpc_response_timeout, - control_exchange => $control_exchange, + executor_thread_pool_size => $executor_thread_pool_size, + transport_url => $default_transport_url, + rpc_response_timeout => $rpc_response_timeout, + control_exchange => $control_exchange, } oslo::messaging::notifications { 'octavia_config': diff -Nru puppet-module-octavia-21.0.0/manifests/keystone/authtoken.pp puppet-module-octavia-22.0.0/manifests/keystone/authtoken.pp --- puppet-module-octavia-21.0.0/manifests/keystone/authtoken.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/keystone/authtoken.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 @@ $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 -Nru puppet-module-octavia-21.0.0/manifests/logging.pp puppet-module-octavia-22.0.0/manifests/logging.pp --- puppet-module-octavia-21.0.0/manifests/logging.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/logging.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/networking.pp puppet-module-octavia-22.0.0/manifests/networking.pp --- puppet-module-octavia-21.0.0/manifests/networking.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/networking.pp 2023-03-24 05:45:59.000000000 +0000 @@ -7,75 +7,73 @@ # [*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 - $port_detach_timeout_real = pick($::octavia::controller::port_detach_timeout, $port_detach_timeout) - octavia_config { 'networking/max_retries': value => $max_retries; 'networking/retry_interval': value => $retry_interval; 'networking/retry_backoff': value => $retry_backoff; 'networking/retry_max': value => $retry_max; - 'networking/port_detach_timeout': value => $port_detach_timeout_real; + 'networking/port_detach_timeout': value => $port_detach_timeout; 'networking/allow_vip_network_id': value => $allow_vip_network_id; 'networking/allow_vip_subnet_id': value => $allow_vip_subnet_id; 'networking/allow_vip_port_id': value => $allow_vip_port_id; diff -Nru puppet-module-octavia-21.0.0/manifests/neutron.pp puppet-module-octavia-22.0.0/manifests/neutron.pp --- puppet-module-octavia-21.0.0/manifests/neutron.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/neutron.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/nova.pp puppet-module-octavia-22.0.0/manifests/nova.pp --- puppet-module-octavia-21.0.0/manifests/nova.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/nova.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/params.pp puppet-module-octavia-22.0.0/manifests/params.pp --- puppet-module-octavia-21.0.0/manifests/params.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/params.pp 2023-03-24 05:45:59.000000000 +0000 @@ -13,7 +13,7 @@ $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 @@ $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 -Nru puppet-module-octavia-21.0.0/manifests/policy.pp puppet-module-octavia-22.0.0/manifests/policy.pp --- puppet-module-octavia-21.0.0/manifests/policy.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/policy.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 @@ -32,9 +32,13 @@ # (Optional) Path to the octavia policy.yaml file # Defaults to /etc/octavia/policy.yaml # +# [*policy_default_rule*] +# (Optional) Default rule. Enforced when a requested rule is not found. +# 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 @@ -42,11 +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_dirs = $::os_service_default, + $policy_default_rule = $facts['os_service_default'], + $policy_dirs = $facts['os_service_default'], $purge_config = false, ) { @@ -70,6 +75,7 @@ enforce_scope => $enforce_scope, enforce_new_defaults => $enforce_new_defaults, policy_file => $policy_path, + policy_default_rule => $policy_default_rule, policy_dirs => $policy_dirs, } diff -Nru puppet-module-octavia-21.0.0/manifests/provider/ovn.pp puppet-module-octavia-22.0.0/manifests/provider/ovn.pp --- puppet-module-octavia-21.0.0/manifests/provider/ovn.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/provider/ovn.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/quota.pp puppet-module-octavia-22.0.0/manifests/quota.pp --- puppet-module-octavia-21.0.0/manifests/quota.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/quota.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/service_auth.pp puppet-module-octavia-22.0.0/manifests/service_auth.pp --- puppet-module-octavia-21.0.0/manifests/service_auth.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/service_auth.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 @@ $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 @@ $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 -Nru puppet-module-octavia-21.0.0/manifests/task_flow.pp puppet-module-octavia-22.0.0/manifests/task_flow.pp --- puppet-module-octavia-21.0.0/manifests/task_flow.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/task_flow.pp 2023-03-24 05:45:59.000000000 +0000 @@ -6,85 +6,94 @@ # # [*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 + $jobboard_redis_backend_ssl_options_real = $jobboard_redis_backend_ssl_options ? { + Hash => join(join_keys_to_values($jobboard_redis_backend_ssl_options, ':'), ','), + default => join(any2array($jobboard_redis_backend_ssl_options), ','), + } + $jobboard_zookeeper_ssl_options_real = $jobboard_zookeeper_ssl_options ? { + Hash => join(join_keys_to_values($jobboard_zookeeper_ssl_options, ':'), ','), + default => join(any2array($jobboard_zookeeper_ssl_options), ','), + } + octavia_config { 'task_flow/engine' : value => $engine; 'task_flow/max_workers' : value => $max_workers; @@ -96,8 +105,8 @@ 'task_flow/jobboard_backend_password' : value => $jobboard_backend_password, secret => true; 'task_flow/jobboard_backend_namespace' : value => $jobboard_backend_namespace; 'task_flow/jobboard_redis_sentinel' : value => $jobboard_redis_sentinel; - 'task_flow/jobboard_redis_backend_ssl_options' : value => join(any2array($jobboard_redis_backend_ssl_options), ','); - 'task_flow/jobboard_zookeeper_ssl_options' : value => join(any2array($jobboard_zookeeper_ssl_options), ','); + 'task_flow/jobboard_redis_backend_ssl_options' : value => $jobboard_redis_backend_ssl_options_real; + 'task_flow/jobboard_zookeeper_ssl_options' : value => $jobboard_zookeeper_ssl_options_real; 'task_flow/jobboard_expiration_time' : value => $jobboard_expiration_time; 'task_flow/jobboard_save_logbook' : value => $jobboard_save_logbook; 'task_flow/persistence_connection' : value => $persistence_connection; diff -Nru puppet-module-octavia-21.0.0/manifests/worker.pp puppet-module-octavia-22.0.0/manifests/worker.pp --- puppet-module-octavia-21.0.0/manifests/worker.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/worker.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 @@ $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', @@ -63,15 +63,17 @@ $ssh_key_type = 'rsa', $ssh_key_bits = 2048, $amp_project_name = 'services', -) inherits octavia::params { +) { include octavia::deps + include octavia::params + include octavia::controller - if !defined(Class['octavia::controller']) { - include octavia::controller - } - + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) + validate_legacy(Boolean, 'validate_bool', $manage_nova_flavor) validate_legacy(Hash, 'validate_hash', $nova_flavor_config) + validate_legacy(Boolean, 'validate_bool', $manage_keygen) if ! $::octavia::controller::amp_flavor_id { if $manage_nova_flavor { diff -Nru puppet-module-octavia-21.0.0/manifests/wsgi/apache.pp puppet-module-octavia-22.0.0/manifests/wsgi/apache.pp --- puppet-module-octavia-21.0.0/manifests/wsgi/apache.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/wsgi/apache.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/manifests/wsgi/uwsgi.pp puppet-module-octavia-22.0.0/manifests/wsgi/uwsgi.pp --- puppet-module-octavia-21.0.0/manifests/wsgi/uwsgi.pp 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/manifests/wsgi/uwsgi.pp 2023-03-24 05:45:59.000000000 +0000 @@ -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 -Nru puppet-module-octavia-21.0.0/metadata.json puppet-module-octavia-22.0.0/metadata.json --- puppet-module-octavia-21.0.0/metadata.json 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/metadata.json 2023-03-24 05:45:59.000000000 +0000 @@ -11,19 +11,19 @@ }, { "name": "openstack/keystone", - "version_requirement": ">=21.0.0 <22.0.0" + "version_requirement": ">=22.0.0 <23.0.0" }, { "name": "openstack/nova", - "version_requirement": ">=21.0.0 <22.0.0" + "version_requirement": ">=22.0.0 <23.0.0" }, { "name": "openstack/openstacklib", - "version_requirement": ">=21.0.0 <22.0.0" + "version_requirement": ">=22.0.0 <23.0.0" }, { "name": "openstack/oslo", - "version_requirement": ">=21.0.0 <22.0.0" + "version_requirement": ">=22.0.0 <23.0.0" }, { "name": "puppet/ssh_keygen", @@ -56,7 +56,7 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "20.04" + "22.04" ] } ], @@ -69,5 +69,5 @@ ], "source": "https://opendev.org/openstack/puppet-octavia.git", "summary": "Puppet module for OpenStack Octavia", - "version": "21.0.0" + "version": "22.0.0" } diff -Nru puppet-module-octavia-21.0.0/releasenotes/notes/amphora_delete-opts-187baf4230e484fb.yaml puppet-module-octavia-22.0.0/releasenotes/notes/amphora_delete-opts-187baf4230e484fb.yaml --- puppet-module-octavia-21.0.0/releasenotes/notes/amphora_delete-opts-187baf4230e484fb.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-octavia-22.0.0/releasenotes/notes/amphora_delete-opts-187baf4230e484fb.yaml 2023-03-24 05:45:59.000000000 +0000 @@ -0,0 +1,8 @@ +--- +features: + - | + The ``octavia::controller`` class now supports the following two new + parameters. + + - ``amphora_delete_retries`` + - ``amphora_delete_retry_interval`` diff -Nru puppet-module-octavia-21.0.0/releasenotes/notes/api-allow_prometheus_listeners-827a53c448d24234.yaml puppet-module-octavia-22.0.0/releasenotes/notes/api-allow_prometheus_listeners-827a53c448d24234.yaml --- puppet-module-octavia-21.0.0/releasenotes/notes/api-allow_prometheus_listeners-827a53c448d24234.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-octavia-22.0.0/releasenotes/notes/api-allow_prometheus_listeners-827a53c448d24234.yaml 2023-03-24 05:45:59.000000000 +0000 @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``octavia::api::allow_prometheus_listeners`` parameter has been + added. diff -Nru puppet-module-octavia-21.0.0/releasenotes/notes/event_notifications-81ee1ce39b3f2c76.yaml puppet-module-octavia-22.0.0/releasenotes/notes/event_notifications-81ee1ce39b3f2c76.yaml --- puppet-module-octavia-21.0.0/releasenotes/notes/event_notifications-81ee1ce39b3f2c76.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-octavia-22.0.0/releasenotes/notes/event_notifications-81ee1ce39b3f2c76.yaml 2023-03-24 05:45:59.000000000 +0000 @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``octavia::controller::event_notifications`` parameter has been + added. diff -Nru puppet-module-octavia-21.0.0/releasenotes/notes/executor_thread_pool_size-4fe786c1a3896dfa.yaml puppet-module-octavia-22.0.0/releasenotes/notes/executor_thread_pool_size-4fe786c1a3896dfa.yaml --- puppet-module-octavia-21.0.0/releasenotes/notes/executor_thread_pool_size-4fe786c1a3896dfa.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-octavia-22.0.0/releasenotes/notes/executor_thread_pool_size-4fe786c1a3896dfa.yaml 2023-03-24 05:45:59.000000000 +0000 @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``octavia::executor_thread_pool_size`` parameter has been added. diff -Nru puppet-module-octavia-21.0.0/releasenotes/notes/move-common-hm-opts-antelope-7bc5a6d57b672afa.yaml puppet-module-octavia-22.0.0/releasenotes/notes/move-common-hm-opts-antelope-7bc5a6d57b672afa.yaml --- puppet-module-octavia-21.0.0/releasenotes/notes/move-common-hm-opts-antelope-7bc5a6d57b672afa.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-octavia-22.0.0/releasenotes/notes/move-common-hm-opts-antelope-7bc5a6d57b672afa.yaml 2023-03-24 05:45:59.000000000 +0000 @@ -0,0 +1,11 @@ +--- +upgrade: + - | + The following parameters of the ``octavia::health_manager`` class have been + removed. + + - ``heartbeat_interval`` + - ``heartbeat_key`` + + - | + Now the ``octavia::controller::heartbeat_key`` parameter is required. diff -Nru puppet-module-octavia-21.0.0/releasenotes/notes/networking-cleanup-26b95cf9d6d51487.yaml puppet-module-octavia-22.0.0/releasenotes/notes/networking-cleanup-26b95cf9d6d51487.yaml --- puppet-module-octavia-21.0.0/releasenotes/notes/networking-cleanup-26b95cf9d6d51487.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-octavia-22.0.0/releasenotes/notes/networking-cleanup-26b95cf9d6d51487.yaml 2023-03-24 05:45:59.000000000 +0000 @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``octavia::controller::port_detach_timeout`` parameter has been + removed. diff -Nru puppet-module-octavia-21.0.0/releasenotes/notes/policy_default_rule-9a7ee88f25808fdc.yaml puppet-module-octavia-22.0.0/releasenotes/notes/policy_default_rule-9a7ee88f25808fdc.yaml --- puppet-module-octavia-21.0.0/releasenotes/notes/policy_default_rule-9a7ee88f25808fdc.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-octavia-22.0.0/releasenotes/notes/policy_default_rule-9a7ee88f25808fdc.yaml 2023-03-24 05:45:59.000000000 +0000 @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``octavia::policy::policy_default_rule`` parameter has been added. diff -Nru puppet-module-octavia-21.0.0/releasenotes/notes/ubuntu-jammy-93978b575d818231.yaml puppet-module-octavia-22.0.0/releasenotes/notes/ubuntu-jammy-93978b575d818231.yaml --- puppet-module-octavia-21.0.0/releasenotes/notes/ubuntu-jammy-93978b575d818231.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-octavia-22.0.0/releasenotes/notes/ubuntu-jammy-93978b575d818231.yaml 2023-03-24 05:45:59.000000000 +0000 @@ -0,0 +1,8 @@ +--- +features: + - | + This module now supports Ubuntu 22.04 (Jammy Jellyfish). + +upgrade: + - | + This module no longer supports Ubuntu 20.04 (Focal Fossa). diff -Nru puppet-module-octavia-21.0.0/releasenotes/source/index.rst puppet-module-octavia-22.0.0/releasenotes/source/index.rst --- puppet-module-octavia-21.0.0/releasenotes/source/index.rst 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/releasenotes/source/index.rst 2023-03-24 05:45:59.000000000 +0000 @@ -9,6 +9,7 @@ :maxdepth: 2 unreleased + zed yoga xena wallaby diff -Nru puppet-module-octavia-21.0.0/releasenotes/source/zed.rst puppet-module-octavia-22.0.0/releasenotes/source/zed.rst --- puppet-module-octavia-21.0.0/releasenotes/source/zed.rst 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-octavia-22.0.0/releasenotes/source/zed.rst 2023-03-24 05:45:59.000000000 +0000 @@ -0,0 +1,6 @@ +======================== +Zed Series Release Notes +======================== + +.. release-notes:: + :branch: stable/zed diff -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_api_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_api_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_api_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_api_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -17,6 +17,7 @@ :healthcheck_enabled => true, :healthcheck_refresh_interval => 5, :allow_ping_health_monitors => true, + :allow_prometheus_listeners => true, } end @@ -67,6 +68,7 @@ is_expected.to contain_octavia_config('api_settings/default_pool_tls_versions').with_value('') is_expected.to contain_octavia_config('api_settings/minimum_tls_version').with_value('') is_expected.to contain_octavia_config('api_settings/allow_ping_health_monitors').with_value('') + is_expected.to contain_octavia_config('api_settings/allow_prometheus_listeners').with_value('') is_expected.to contain_oslo__middleware('octavia_config').with( :enable_proxy_headers_parsing => '', ) @@ -89,6 +91,7 @@ is_expected.to contain_octavia_config('api_settings/healthcheck_enabled').with_value( params[:healthcheck_enabled] ) is_expected.to contain_octavia_config('api_settings/healthcheck_refresh_interval').with_value( params[:healthcheck_refresh_interval] ) is_expected.to contain_octavia_config('api_settings/allow_ping_health_monitors').with_value( params[:allow_ping_health_monitors] ) + is_expected.to contain_octavia_config('api_settings/allow_prometheus_listeners').with_value( params[:allow_prometheus_listeners] ) end [{:enabled => true}, {:enabled => false}].each do |param_hash| @@ -267,7 +270,7 @@ 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 -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_client_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_client_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_client_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_client_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -38,7 +38,7 @@ end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :client_package_name => 'python3-octaviaclient' } when 'RedHat' diff -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_controller_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_controller_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_controller_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_controller_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -4,16 +4,23 @@ shared_examples_for 'octavia-controller' do + let :req_params do + { :heartbeat_key => 'abcdefghi' } + end + context 'with invalid lb topology' do let :params do - { :loadbalancer_topology => 'foo', } + req_params.merge({ + :loadbalancer_topology => 'foo' + }) end it { is_expected.to raise_error(Puppet::Error) } end context 'configured with specific parameters' do let :params do - { :amp_active_retries => '30', + req_params.merge({ + :amp_active_retries => '30', :amp_active_wait_sec => '10', :amp_flavor_id => '42', :amp_image_tag => 'amphorae1', @@ -28,6 +35,9 @@ :image_driver => 'sample_image_driver', :amp_ssh_key_name => 'custom-amphora-key', :amp_timezone => 'UTC', + :amphora_delete_retries => 5, + :amphora_delete_retry_interval => 5, + :event_notifications => true, :timeout_client_data => 60, :timeout_member_connect => 5, :timeout_member_data => 60, @@ -42,7 +52,6 @@ :build_active_retries => 120, :build_retry_interval => 5, :default_connection_limit => 50000, - :port_detach_timeout => 15, :agent_request_read_timeout => 180, :agent_tls_protocol => 'TLSv1.2', :admin_log_targets => ['192.0.2.1:10514', '2001:db8:1::10:10514'], @@ -65,8 +74,7 @@ :vrrp_garp_refresh_count => 2, :controller_ip_port_list => ['1.2.3.4:5555', '4.3.2.1:5555'], :heartbeat_interval => 10, - :heartbeat_key => 'default_key', - } + }) end it 'configures with the specified values' do @@ -85,6 +93,9 @@ is_expected.to contain_octavia_config('controller_worker/image_driver').with_value('sample_image_driver') is_expected.to contain_octavia_config('controller_worker/amp_ssh_key_name').with_value('custom-amphora-key') is_expected.to contain_octavia_config('controller_worker/amp_timezone').with_value('UTC') + is_expected.to contain_octavia_config('controller_worker/amphora_delete_retries').with_value(5) + is_expected.to contain_octavia_config('controller_worker/amphora_delete_retry_interval').with_value(5) + is_expected.to contain_octavia_config('controller_worker/event_notifications').with_value(true) is_expected.to contain_octavia_config('haproxy_amphora/timeout_client_data').with_value(60) is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_connect').with_value(5) is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value(60) @@ -99,7 +110,6 @@ is_expected.to contain_octavia_config('haproxy_amphora/build_active_retries').with_value(120) is_expected.to contain_octavia_config('haproxy_amphora/build_retry_interval').with_value(5) is_expected.to contain_octavia_config('haproxy_amphora/default_connection_limit').with_value(50000) - is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value(15) is_expected.to contain_octavia_config('amphora_agent/agent_request_read_timeout').with_value(180) is_expected.to contain_octavia_config('amphora_agent/agent_tls_protocol').with_value('TLSv1.2') is_expected.to contain_octavia_config('amphora_agent/admin_log_targets').with_value('192.0.2.1:10514,2001:db8:1::10:10514') @@ -122,70 +132,79 @@ is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_count').with_value(2) is_expected.to contain_octavia_config('health_manager/controller_ip_port_list').with_value('1.2.3.4:5555,4.3.2.1:5555') is_expected.to contain_octavia_config('health_manager/heartbeat_interval').with_value(10) - is_expected.to contain_octavia_config('health_manager/heartbeat_key').with_value('default_key') end end - it 'configures with the default values' do - is_expected.to contain_octavia_config('controller_worker/amp_active_retries').with_value('') - is_expected.to contain_octavia_config('controller_worker/amp_active_wait_sec').with_value('') - is_expected.to contain_octavia_config('controller_worker/amp_flavor_id').with_value('65') - is_expected.to contain_octavia_config('controller_worker/amp_image_tag').with_value('') - is_expected.to contain_octavia_config('controller_worker/amp_image_owner_id').with_value('') - is_expected.to contain_octavia_config('controller_worker/amp_secgroup_list').with_value('') - is_expected.to contain_octavia_config('controller_worker/amp_boot_network_list').with_value('') - is_expected.to contain_octavia_config('controller_worker/loadbalancer_topology').with_value('') - is_expected.to contain_octavia_config('controller_worker/amphora_driver').with_value('') - is_expected.to contain_octavia_config('controller_worker/compute_driver').with_value('') - is_expected.to contain_octavia_config('controller_worker/network_driver').with_value('') - is_expected.to contain_octavia_config('controller_worker/volume_driver').with_value('') - is_expected.to contain_octavia_config('controller_worker/image_driver').with_value('') - is_expected.to contain_octavia_config('controller_worker/amp_ssh_key_name').with_value('octavia-ssh-key') - is_expected.to contain_octavia_config('controller_worker/amp_timezone').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/timeout_client_data').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_connect').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/timeout_tcp_inspect').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/connection_max_retries').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/connection_retry_interval').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/connection_logging').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/active_connection_max_retries').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/active_connection_retry_interval').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/failover_connection_max_retries').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/failover_connection_retry_interval').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/build_rate_limit').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/build_active_retries').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/build_retry_interval').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/default_connection_limit').with_value('') - is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value('') - is_expected.to contain_octavia_config('amphora_agent/agent_request_read_timeout').with_value('') - is_expected.to contain_octavia_config('amphora_agent/agent_tls_protocol').with_value('') - is_expected.to contain_octavia_config('amphora_agent/admin_log_targets').with_value('') - is_expected.to contain_octavia_config('amphora_agent/administrative_log_facility').with_value('') - is_expected.to contain_octavia_config('amphora_agent/forward_all_logs').with_value('') - is_expected.to contain_octavia_config('amphora_agent/tenant_log_targets').with_value('') - is_expected.to contain_octavia_config('amphora_agent/user_log_facility').with_value('') - is_expected.to contain_octavia_config('haproxy_amphora/user_log_format').with_value('') - is_expected.to contain_octavia_config('amphora_agent/log_protocol').with_value('') - is_expected.to contain_octavia_config('amphora_agent/log_retry_count').with_value('') - is_expected.to contain_octavia_config('amphora_agent/log_retry_interval').with_value('') - is_expected.to contain_octavia_config('amphora_agent/log_queue_size').with_value('') - is_expected.to contain_octavia_config('amphora_agent/logging_template_override').with_value('') - is_expected.to contain_octavia_config('amphora_agent/disable_local_log_storage').with_value('') - is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_advert_int').with_value('') - is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_check_interval').with_value('') - is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_fail_count').with_value('') - is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_success_count').with_value('') - is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_interval').with_value('') - is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_count').with_value('') - is_expected.to contain_octavia_config('health_manager/controller_ip_port_list').with_value('') - #is_expected.to contain_octavia_config('health_manager/heartbeat_interval').with_value('') - #is_expected.to contain_octavia_config('health_manager/heartbeat_key').with_value('') + context 'configured with defaults' do + let :params do + req_params + end + + it 'configures with the default values' do + is_expected.to contain_octavia_config('controller_worker/amp_active_retries').with_value('') + is_expected.to contain_octavia_config('controller_worker/amp_active_wait_sec').with_value('') + is_expected.to contain_octavia_config('controller_worker/amp_flavor_id').with_value('65') + is_expected.to contain_octavia_config('controller_worker/amp_image_tag').with_value('') + is_expected.to contain_octavia_config('controller_worker/amp_image_owner_id').with_value('') + is_expected.to contain_octavia_config('controller_worker/amp_secgroup_list').with_value('') + is_expected.to contain_octavia_config('controller_worker/amp_boot_network_list').with_value('') + is_expected.to contain_octavia_config('controller_worker/loadbalancer_topology').with_value('') + is_expected.to contain_octavia_config('controller_worker/amphora_driver').with_value('') + is_expected.to contain_octavia_config('controller_worker/compute_driver').with_value('') + is_expected.to contain_octavia_config('controller_worker/network_driver').with_value('') + is_expected.to contain_octavia_config('controller_worker/volume_driver').with_value('') + is_expected.to contain_octavia_config('controller_worker/image_driver').with_value('') + is_expected.to contain_octavia_config('controller_worker/amp_ssh_key_name').with_value('octavia-ssh-key') + is_expected.to contain_octavia_config('controller_worker/amp_timezone').with_value('') + is_expected.to contain_octavia_config('controller_worker/amphora_delete_retries').with_value('') + is_expected.to contain_octavia_config('controller_worker/amphora_delete_retry_interval').with_value('') + is_expected.to contain_octavia_config('controller_worker/event_notifications').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/timeout_client_data').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_connect').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/timeout_tcp_inspect').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/connection_max_retries').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/connection_retry_interval').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/connection_logging').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/active_connection_max_retries').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/active_connection_retry_interval').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/failover_connection_max_retries').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/failover_connection_retry_interval').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/build_rate_limit').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/build_active_retries').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/build_retry_interval').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/default_connection_limit').with_value('') + is_expected.to contain_octavia_config('amphora_agent/agent_request_read_timeout').with_value('') + is_expected.to contain_octavia_config('amphora_agent/agent_tls_protocol').with_value('') + is_expected.to contain_octavia_config('amphora_agent/admin_log_targets').with_value('') + is_expected.to contain_octavia_config('amphora_agent/administrative_log_facility').with_value('') + is_expected.to contain_octavia_config('amphora_agent/forward_all_logs').with_value('') + is_expected.to contain_octavia_config('amphora_agent/tenant_log_targets').with_value('') + is_expected.to contain_octavia_config('amphora_agent/user_log_facility').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/user_log_format').with_value('') + is_expected.to contain_octavia_config('amphora_agent/log_protocol').with_value('') + is_expected.to contain_octavia_config('amphora_agent/log_retry_count').with_value('') + is_expected.to contain_octavia_config('amphora_agent/log_retry_interval').with_value('') + is_expected.to contain_octavia_config('amphora_agent/log_queue_size').with_value('') + is_expected.to contain_octavia_config('amphora_agent/logging_template_override').with_value('') + is_expected.to contain_octavia_config('amphora_agent/disable_local_log_storage').with_value('') + is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_advert_int').with_value('') + is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_check_interval').with_value('') + is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_fail_count').with_value('') + is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_success_count').with_value('') + is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_interval').with_value('') + is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_count').with_value('') + is_expected.to contain_octavia_config('health_manager/controller_ip_port_list').with_value('') + is_expected.to contain_octavia_config('health_manager/heartbeat_interval').with_value('') + is_expected.to contain_octavia_config('health_manager/heartbeat_key').with_value('abcdefghi') + end end context 'with ssh key access disabled' do let :params do - { :enable_ssh_access => false } + req_params.merge({ + :enable_ssh_access => false + }) end it 'disables configuration of SSH key properties' do @@ -193,6 +212,14 @@ end end + context 'with an invalid value for heartbeat key' do + let :params do + req_params.merge({ + :heartbeat_key => 0, + }) + end + it { expect { is_expected.to raise_error(Puppet::Error) } } + end end on_supported_os({ diff -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_driver_agent_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_driver_agent_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_driver_agent_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_driver_agent_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -80,7 +80,7 @@ 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 -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_health_manager_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_health_manager_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_health_manager_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_health_manager_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -6,39 +6,24 @@ { :enabled => true, :manage_service => true, :package_ensure => 'latest', - :heartbeat_key => 'default_key' } end shared_examples_for 'octavia-health-manager' do - context 'without a heartbeat key' do - before { params.delete(:heartbeat_key) } - it { expect { is_expected.to raise_error(Puppet::Error) } } - end - - context 'with an invalid value for heartbeat key' do - before do - params.merge!({ - :heartbeat_key => 0, - }) - end - it { expect { is_expected.to raise_error(Puppet::Error) } } + let :pre_condition do + "include nova + class { 'octavia::controller' : + heartbeat_key => 'abcdefghi', + }" end context 'with minimal parameters' do - before do - params.merge!({ - :heartbeat_key => 'abcdefghi', - }) - end - it { is_expected.to contain_octavia_config('health_manager/heartbeat_key').with_value('abcdefghi') } it { is_expected.to contain_octavia_config('health_manager/health_update_threads').with_value('4') } it { is_expected.to contain_octavia_config('health_manager/stats_update_threads').with_value('4') } it { is_expected.to contain_octavia_config('health_manager/failover_threads').with_value('') } it { is_expected.to contain_octavia_config('health_manager/heartbeat_timeout').with_value('') } it { is_expected.to contain_octavia_config('health_manager/health_check_interval').with_value('') } - it { is_expected.to contain_octavia_config('health_manager/heartbeat_interval').with_value('') } it { is_expected.to contain_octavia_config('health_manager/sock_rlimit').with_value('') } it { is_expected.to contain_octavia_config('health_manager/failover_threshold').with_value('') } end @@ -106,7 +91,6 @@ :failover_threads => 10, :heartbeat_timeout => 60, :health_check_interval => 3, - :heartbeat_interval => 42, :sock_rlimit => 1, :failover_threshold => 2, }) @@ -116,7 +100,6 @@ it { is_expected.to contain_octavia_config('health_manager/failover_threads').with_value(10) } it { is_expected.to contain_octavia_config('health_manager/heartbeat_timeout').with_value(60) } it { is_expected.to contain_octavia_config('health_manager/health_check_interval').with_value(3) } - it { is_expected.to contain_octavia_config('health_manager/heartbeat_interval').with_value(42) } it { is_expected.to contain_octavia_config('health_manager/sock_rlimit').with_value(1) } it { is_expected.to contain_octavia_config('health_manager/failover_threshold').with_value(2) } end @@ -130,7 +113,7 @@ 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 -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_housekeeping_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_housekeeping_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_housekeeping_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_housekeeping_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -88,7 +88,7 @@ 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 -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_init_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_init_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_init_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_init_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -29,9 +29,10 @@ it 'configures rabbit' do should contain_oslo__messaging__default('octavia_config').with( - :transport_url => '', - :rpc_response_timeout => '', - :control_exchange => '', + :executor_thread_pool_size => '', + :transport_url => '', + :rpc_response_timeout => '', + :control_exchange => '', ) should contain_oslo__messaging__rabbit('octavia_config').with( :rabbit_ha_queues => '', @@ -82,6 +83,7 @@ :default_transport_url => 'rabbit://rabbit_user:password@localhost:5673', :rpc_response_timeout => '120', :control_exchange => 'octavia', + :executor_thread_pool_size => 64, :rabbit_ha_queues => true, :rabbit_heartbeat_timeout_threshold => '60', :rabbit_heartbeat_rate => '10', @@ -100,9 +102,10 @@ it 'configures rabbit' do should contain_oslo__messaging__default('octavia_config').with( - :transport_url => 'rabbit://rabbit_user:password@localhost:5673', - :rpc_response_timeout => '120', - :control_exchange => 'octavia', + :executor_thread_pool_size => 64, + :transport_url => 'rabbit://rabbit_user:password@localhost:5673', + :rpc_response_timeout => '120', + :control_exchange => 'octavia', ) should contain_oslo__messaging__rabbit('octavia_config').with( :rabbit_ha_queues => true, @@ -227,7 +230,7 @@ end let(:platform_params) do - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' { :octavia_common_package => 'octavia-common' } when 'RedHat' diff -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_policy_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_policy_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_policy_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_policy_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -9,6 +9,7 @@ :enforce_scope => false, :enforce_new_defaults => false, :policy_path => '/etc/octavia/policy.yaml', + :policy_default_rule => 'default', :policy_dirs => '/etc/octavia/policy.d', :policies => { 'context_is_admin' => { @@ -37,6 +38,7 @@ :enforce_scope => false, :enforce_new_defaults => false, :policy_file => '/etc/octavia/policy.yaml', + :policy_default_rule => 'default', :policy_dirs => '/etc/octavia/policy.d', ) end diff -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_quota_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_quota_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_quota_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_quota_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -63,7 +63,7 @@ }).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 -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_task_flow_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_task_flow_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_task_flow_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_task_flow_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -61,6 +61,26 @@ should contain_octavia_config('task_flow/persistence_connection').with_value('sqlite://') } end + + context 'with ssl options set to dict' do + let :params do + { + :jobboard_redis_backend_ssl_options => { + 'ssl' => 'false', + 'ssl_keyfile' => 'None' + }, + :jobboard_zookeeper_ssl_options => { + 'use_ssl' => 'false', + 'keyfile' => 'None' + }, + } + end + + it { + should contain_octavia_config('task_flow/jobboard_redis_backend_ssl_options').with_value('ssl:false,ssl_keyfile:None') + should contain_octavia_config('task_flow/jobboard_zookeeper_ssl_options').with_value('use_ssl:false,keyfile:None') + } + end end on_supported_os({ diff -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_worker_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_worker_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_worker_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_worker_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -15,11 +15,19 @@ shared_examples_for 'octavia-worker' do + let :pre_condition do + "include nova + class { 'octavia::controller' : + heartbeat_key => 'abcdefghi', + }" + end + context 'configured with specific parameters' do let :pre_condition do "include nova class { 'octavia::controller' : amp_flavor_id => '42', + heartbeat_key => 'abcdefghi', }" end @@ -54,7 +62,8 @@ let :pre_condition do "include nova class { 'octavia::controller' : - manage_ssh_access = false, + enable_ssh_access => false, + heartbeat_key => 'abcdefghi', }" end @@ -113,7 +122,8 @@ before do params.merge!({ :manage_service => false, - :enabled => false }) + :enabled => false + }) end it 'does not configure octavia-worker service' do @@ -199,7 +209,7 @@ 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 -Nru puppet-module-octavia-21.0.0/spec/classes/octavia_wsgi_apache_spec.rb puppet-module-octavia-22.0.0/spec/classes/octavia_wsgi_apache_spec.rb --- puppet-module-octavia-21.0.0/spec/classes/octavia_wsgi_apache_spec.rb 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/spec/classes/octavia_wsgi_apache_spec.rb 2023-03-24 05:45:59.000000000 +0000 @@ -10,7 +10,7 @@ :group => 'octavia', :path => '/', :priority => 10, - :servername => facts[:fqdn], + :servername => 'foo.example.com', :ssl => false, :threads => 1, :user => 'octavia', @@ -147,14 +147,12 @@ 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', diff -Nru puppet-module-octavia-21.0.0/.zuul.yaml puppet-module-octavia-22.0.0/.zuul.yaml --- puppet-module-octavia-21.0.0/.zuul.yaml 2022-10-05 09:25:40.000000000 +0000 +++ puppet-module-octavia-22.0.0/.zuul.yaml 2023-03-24 05:45:59.000000000 +0000 @@ -6,48 +6,3 @@ - puppet-openstack-integration-jobs-scenario005 - puppet-openstack-litmus-jobs - release-notes-jobs-python3 - check: - jobs: - - puppet-octavia-tripleo-standalone - gate: - jobs: - - puppet-octavia-tripleo-standalone - -- nodeset: - name: puppet-octavia-tripleo-single-node-centos-9-stream-nested-virt - nodes: - - name: primary - label: nested-virt-centos-9-stream - groups: - - name: switch - nodes: - - primary - - name: peers - nodes: [] - -- job: - name: puppet-octavia-tripleo-standalone - parent: tripleo-puppet-ci-centos-9-standalone - nodeset: puppet-octavia-tripleo-single-node-centos-9-stream-nested-virt - description: | - TripleO standalone Job running Octavia specific Tempest tests. - vars: - build_container_images: true - tags: - - build - - standalone - - octavia - - nested-virt - featureset_override: - run_tempest: false - tempest_test_whitelist: - - 'octavia_tempest_plugin.tests.scenario.v2.test_healthmonitor' - - 'octavia_tempest_plugin.tests.scenario.v2.test_listener' - - 'octavia_tempest_plugin.tests.scenario.v2.test_member' - - 'octavia_tempest_plugin.tests.scenario.v2.test_load_balancer' - use_os_tempest: true - validate_services: false - standalone_environment_files: - - 'environments/low-memory-usage.yaml' - - 'ci/environments/scenario013-standalone.yaml' - - 'ci/environments/octavia-kvm.yaml'