diff -Nru puppet-module-sahara-22.0.0/CHANGELOG.md puppet-module-sahara-23.0.0/CHANGELOG.md --- puppet-module-sahara-22.0.0/CHANGELOG.md 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/CHANGELOG.md 2023-10-11 03:09:20.000000000 +0000 @@ -1,7 +1,7 @@ ## 8.0.0 and beyond From 8.0.0 release and beyond, release notes are published on -[docs.openstack.org](http://docs.openstack.org/releasenotes/puppet-sahara/). +[docs.openstack.org](https://docs.openstack.org/releasenotes/puppet-sahara/). ##2015-11-25 - 7.0.0 ###Summary diff -Nru puppet-module-sahara-22.0.0/debian/changelog puppet-module-sahara-23.0.0/debian/changelog --- puppet-module-sahara-22.0.0/debian/changelog 2023-06-20 09:32:53.000000000 +0000 +++ puppet-module-sahara-23.0.0/debian/changelog 2023-10-24 12:00:27.000000000 +0000 @@ -1,3 +1,10 @@ +puppet-module-sahara (23.0.0-1) unstable; urgency=medium + + * New upstream release. + * Fixed versions of depends for this release. + + -- Thomas Goirand Tue, 24 Oct 2023 14:00:27 +0200 + puppet-module-sahara (22.0.0-2) unstable; urgency=medium * Upload to unstable. diff -Nru puppet-module-sahara-22.0.0/debian/control puppet-module-sahara-23.0.0/debian/control --- puppet-module-sahara-22.0.0/debian/control 2023-06-20 09:32:53.000000000 +0000 +++ puppet-module-sahara-23.0.0/debian/control 2023-10-24 12:00:27.000000000 +0000 @@ -19,9 +19,9 @@ Architecture: all Depends: puppet, - puppet-module-keystone (>= 22.0.0), - puppet-module-openstacklib (>= 22.0.0), - puppet-module-oslo (>= 22.0.0), + puppet-module-keystone (>= 23.0.0), + puppet-module-openstacklib (>= 23.0.0), + puppet-module-oslo (>= 23.0.0), puppet-module-puppetlabs-inifile, puppet-module-puppetlabs-stdlib, ${misc:Depends}, diff -Nru puppet-module-sahara-22.0.0/manifests/config.pp puppet-module-sahara-23.0.0/manifests/config.pp --- puppet-module-sahara-22.0.0/manifests/config.pp 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/manifests/config.pp 2023-10-11 03:09:20.000000000 +0000 @@ -24,15 +24,12 @@ # or Puppet catalog compilation will fail with duplicate resources. # class sahara::config ( - $sahara_config = {}, - $sahara_api_paste_ini = {}, + Hash $sahara_config = {}, + Hash $sahara_api_paste_ini = {}, ) { include sahara::deps - validate_legacy(Hash, 'validate_hash', $sahara_config) - validate_legacy(Hash, 'validate_hash', $sahara_api_paste_ini) - create_resources('sahara_config', $sahara_config) create_resources('sahara_api_paste_ini', $sahara_api_paste_ini) } diff -Nru puppet-module-sahara-22.0.0/manifests/db/mysql.pp puppet-module-sahara-23.0.0/manifests/db/mysql.pp --- puppet-module-sahara-22.0.0/manifests/db/mysql.pp 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/manifests/db/mysql.pp 2023-10-11 03:09:20.000000000 +0000 @@ -33,7 +33,7 @@ # Defaults to 'utf8_general_ci'. # class sahara::db::mysql( - $password, + String[1] $password, $dbname = 'sahara', $user = 'sahara', $host = '127.0.0.1', @@ -44,8 +44,6 @@ include sahara::deps - validate_legacy(String, 'validate_string', $password) - ::openstacklib::db::mysql{ 'sahara': user => $user, password => $password, diff -Nru puppet-module-sahara-22.0.0/manifests/deps.pp puppet-module-sahara-23.0.0/manifests/deps.pp --- puppet-module-sahara-22.0.0/manifests/deps.pp 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/manifests/deps.pp 2023-10-11 03:09:20.000000000 +0000 @@ -31,8 +31,8 @@ # policy config should occur in the config block also. Anchor['sahara::config::begin'] - -> Openstacklib::Policy<||> - ~> Anchor['sahara::config::end'] + -> Openstacklib::Policy<| tag == 'sahara' |> + -> Anchor['sahara::config::end'] # On any uwsgi config change, we must restart Sahara API. Anchor['sahara::config::begin'] @@ -43,6 +43,13 @@ # before dbsync starts Oslo::Db<||> -> Anchor['sahara::dbsync::begin'] + # We need openstackclient before marking service end so that sahara + # will have clients available to create resources. This tag handles the + # openstackclient but indirectly since the client is not available in + # all catalogs that don't need the client class (like many spec tests) + Package<| tag == 'openstack'|> + ~> Anchor['sahara::service::end'] + # Installation or config changes will always restart services. Anchor['sahara::install::end'] ~> Anchor['sahara::service::begin'] Anchor['sahara::config::end'] ~> Anchor['sahara::service::begin'] diff -Nru puppet-module-sahara-22.0.0/manifests/init.pp puppet-module-sahara-23.0.0/manifests/init.pp --- puppet-module-sahara-22.0.0/manifests/init.pp 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/manifests/init.pp 2023-10-11 03:09:20.000000000 +0000 @@ -39,7 +39,7 @@ # # [*use_ssl*] # (optional) Enable SSL on the API server -# Defaults to $facts['os_service_default'], not set. +# Defaults to false # # [*cert_file*] # (optinal) Certificate file to use when starting API server securely @@ -109,6 +109,24 @@ # will be run through a green thread. # Defaults to $facts['os_service_default'] # +# [*rabbit_quorum_queue*] +# (Optional) Use quorum queues in RabbitMQ. +# Defaults to $facts['os_service_default'] +# +# [*rabbit_quorum_delivery_limit*] +# (Optional) Each time a message is rdelivered to a consumer, a counter is +# incremented. Once the redelivery count exceeds the delivery limit +# the message gets dropped or dead-lettered. +# Defaults to $facts['os_service_default'] +# +# [*rabbit_quorum_max_memory_length*] +# (Optional) Limit the number of messages in the quorum queue. +# Defaults to $facts['os_service_default'] +# +# [*rabbit_quorum_max_memory_bytes*] +# (Optional) Limit the number of memory bytes used by the quorum queue. +# 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 @@ -214,53 +232,57 @@ # Defaults to $facts['os_service_default'] # class sahara( - $package_ensure = 'present', - $host = $facts['os_service_default'], - $port = $facts['os_service_default'], - $plugins = $facts['os_service_default'], - $use_floating_ips = $facts['os_service_default'], - $node_domain = $facts['os_service_default'], - $use_designate = $facts['os_service_default'], - $nameservers = $facts['os_service_default'], - $use_ssl = $facts['os_service_default'], - $ca_file = $facts['os_service_default'], - $cert_file = $facts['os_service_default'], - $key_file = $facts['os_service_default'], - $sync_db = true, - $default_transport_url = $facts['os_service_default'], - $rpc_response_timeout = $facts['os_service_default'], - $control_exchange = $facts['os_service_default'], - $amqp_durable_queues = $facts['os_service_default'], - $rabbit_ha_queues = $facts['os_service_default'], - $rabbit_use_ssl = $facts['os_service_default'], - $rabbit_login_method = $facts['os_service_default'], - $rabbit_retry_interval = $facts['os_service_default'], - $rabbit_retry_backoff = $facts['os_service_default'], - $rabbit_heartbeat_in_pthread = $facts['os_service_default'], - $kombu_ssl_version = $facts['os_service_default'], - $kombu_ssl_keyfile = $facts['os_service_default'], - $kombu_ssl_certfile = $facts['os_service_default'], - $kombu_ssl_ca_certs = $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_server_request_prefix = $facts['os_service_default'], - $amqp_broadcast_prefix = $facts['os_service_default'], - $amqp_group_request_prefix = $facts['os_service_default'], - $amqp_container_name = $facts['os_service_default'], - $amqp_idle_timeout = $facts['os_service_default'], - $amqp_trace = $facts['os_service_default'], - $amqp_ssl_ca_file = $facts['os_service_default'], - $amqp_ssl_cert_file = $facts['os_service_default'], - $amqp_ssl_key_file = $facts['os_service_default'], - $amqp_ssl_key_password = $facts['os_service_default'], - $amqp_sasl_mechanisms = $facts['os_service_default'], - $amqp_sasl_config_dir = $facts['os_service_default'], - $amqp_sasl_config_name = $facts['os_service_default'], - $amqp_username = $facts['os_service_default'], - $amqp_password = $facts['os_service_default'], - $purge_config = false, - $default_ntp_server = $facts['os_service_default'], + $package_ensure = 'present', + $host = $facts['os_service_default'], + $port = $facts['os_service_default'], + $plugins = $facts['os_service_default'], + $use_floating_ips = $facts['os_service_default'], + $node_domain = $facts['os_service_default'], + $use_designate = $facts['os_service_default'], + $nameservers = $facts['os_service_default'], + Boolean $use_ssl = false, + $ca_file = $facts['os_service_default'], + $cert_file = $facts['os_service_default'], + $key_file = $facts['os_service_default'], + Boolean $sync_db = true, + $default_transport_url = $facts['os_service_default'], + $rpc_response_timeout = $facts['os_service_default'], + $control_exchange = $facts['os_service_default'], + $amqp_durable_queues = $facts['os_service_default'], + $rabbit_ha_queues = $facts['os_service_default'], + $rabbit_use_ssl = $facts['os_service_default'], + $rabbit_login_method = $facts['os_service_default'], + $rabbit_retry_interval = $facts['os_service_default'], + $rabbit_retry_backoff = $facts['os_service_default'], + $rabbit_heartbeat_in_pthread = $facts['os_service_default'], + $rabbit_quorum_queue = $facts['os_service_default'], + $rabbit_quorum_delivery_limit = $facts['os_service_default'], + $rabbit_quorum_max_memory_length = $facts['os_service_default'], + $rabbit_quorum_max_memory_bytes = $facts['os_service_default'], + $kombu_ssl_version = $facts['os_service_default'], + $kombu_ssl_keyfile = $facts['os_service_default'], + $kombu_ssl_certfile = $facts['os_service_default'], + $kombu_ssl_ca_certs = $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_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'], + Boolean $purge_config = false, + $default_ntp_server = $facts['os_service_default'], ) { include sahara::deps @@ -295,20 +317,24 @@ } oslo::messaging::rabbit { 'sahara_config': - rabbit_ha_queues => $rabbit_ha_queues, - rabbit_use_ssl => $rabbit_use_ssl, - kombu_failover_strategy => $kombu_failover_strategy, - kombu_compression => $kombu_compression, - kombu_reconnect_delay => $kombu_reconnect_delay, - kombu_ssl_version => $kombu_ssl_version, - kombu_ssl_keyfile => $kombu_ssl_keyfile, - kombu_ssl_certfile => $kombu_ssl_certfile, - kombu_ssl_ca_certs => $kombu_ssl_ca_certs, - amqp_durable_queues => $amqp_durable_queues, - rabbit_login_method => $rabbit_login_method, - rabbit_retry_interval => $rabbit_retry_interval, - rabbit_retry_backoff => $rabbit_retry_backoff, - heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, + rabbit_ha_queues => $rabbit_ha_queues, + rabbit_use_ssl => $rabbit_use_ssl, + kombu_failover_strategy => $kombu_failover_strategy, + kombu_compression => $kombu_compression, + kombu_reconnect_delay => $kombu_reconnect_delay, + kombu_ssl_version => $kombu_ssl_version, + kombu_ssl_keyfile => $kombu_ssl_keyfile, + kombu_ssl_certfile => $kombu_ssl_certfile, + kombu_ssl_ca_certs => $kombu_ssl_ca_certs, + amqp_durable_queues => $amqp_durable_queues, + rabbit_login_method => $rabbit_login_method, + rabbit_retry_interval => $rabbit_retry_interval, + rabbit_retry_backoff => $rabbit_retry_backoff, + heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, + rabbit_quorum_queue => $rabbit_quorum_queue, + rabbit_quorum_delivery_limit => $rabbit_quorum_delivery_limit, + rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length, + rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes, } oslo::messaging::amqp { 'sahara_config': @@ -329,7 +355,7 @@ password => $amqp_password, } - if ! is_service_default($use_ssl) and $use_ssl { + if $use_ssl { if is_service_default($cert_file) { fail('The cert_file parameter is required when use_ssl is set to true') } @@ -337,9 +363,15 @@ fail('The key_file parameter is required when use_ssl is set to true') } sahara_config { - 'ssl/cert_file' : value => $cert_file; - 'ssl/key_file' : value => $key_file; - 'ssl/ca_file' : value => $ca_file; + 'ssl/cert_file': value => $cert_file; + 'ssl/key_file': value => $key_file; + 'ssl/ca_file': value => $ca_file; + } + } else { + sahara_config { + 'ssl/cert_file': ensure => absent; + 'ssl/key_file': ensure => absent; + 'ssl/ca_file': ensure => absent; } } diff -Nru puppet-module-sahara-22.0.0/manifests/keystone/authtoken.pp puppet-module-sahara-23.0.0/manifests/keystone/authtoken.pp --- puppet-module-sahara-22.0.0/manifests/keystone/authtoken.pp 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/manifests/keystone/authtoken.pp 2023-10-11 03:09:20.000000000 +0000 @@ -5,14 +5,13 @@ # # === Parameters # +# [*password*] +# (Required) Password to create for the service user +# # [*username*] # (Optional) The name of the service user # Defaults to 'sahara' # -# [*password*] -# (Optional) Password to create for the service user -# Defaults to $facts['os_service_default'] -# # [*auth_url*] # (Optional) The URL to use for authentication. # Defaults to 'http:://127.0.0.1:5000' @@ -193,8 +192,8 @@ # Defaults to $facts['os_service_default']. # class sahara::keystone::authtoken( + String[1] $password, $username = 'sahara', - $password = $facts['os_service_default'], $auth_url = 'http://127.0.0.1:5000/', $project_name = 'services', $user_domain_name = 'Default', diff -Nru puppet-module-sahara-22.0.0/manifests/policy.pp puppet-module-sahara-23.0.0/manifests/policy.pp --- puppet-module-sahara-22.0.0/manifests/policy.pp 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/manifests/policy.pp 2023-10-11 03:09:20.000000000 +0000 @@ -48,18 +48,16 @@ class sahara::policy ( $enforce_scope = $facts['os_service_default'], $enforce_new_defaults = $facts['os_service_default'], - $policies = {}, + Hash $policies = {}, $policy_path = '/etc/sahara/policy.yaml', $policy_default_rule = $facts['os_service_default'], $policy_dirs = $facts['os_service_default'], - $purge_config = false, + Boolean $purge_config = false, ) { include sahara::deps include sahara::params - validate_legacy(Hash, 'validate_hash', $policies) - $policy_parameters = { policies => $policies, policy_path => $policy_path, @@ -67,6 +65,7 @@ file_group => $::sahara::params::group, file_format => 'yaml', purge_config => $purge_config, + tag => 'sahara', } create_resources('openstacklib::policy', { $policy_path => $policy_parameters }) diff -Nru puppet-module-sahara-22.0.0/manifests/service/api.pp puppet-module-sahara-23.0.0/manifests/service/api.pp --- puppet-module-sahara-22.0.0/manifests/service/api.pp 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/manifests/service/api.pp 2023-10-11 03:09:20.000000000 +0000 @@ -31,11 +31,11 @@ # Defaults to '$::sahara::params::api_service_name' # class sahara::service::api ( - $api_workers = $facts['os_workers'], - $enabled = true, - $manage_service = true, - $package_ensure = 'present', - $service_name = $::sahara::params::api_service_name, + $api_workers = $facts['os_workers'], + Boolean $enabled = true, + Boolean $manage_service = true, + $package_ensure = 'present', + $service_name = $::sahara::params::api_service_name, ) inherits sahara::params { include sahara::deps diff -Nru puppet-module-sahara-22.0.0/manifests/service/engine.pp puppet-module-sahara-23.0.0/manifests/service/engine.pp --- puppet-module-sahara-22.0.0/manifests/service/engine.pp 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/manifests/service/engine.pp 2023-10-11 03:09:20.000000000 +0000 @@ -56,8 +56,8 @@ # Defaults to $facts['os_service_default'] # class sahara::service::engine ( - $enabled = true, - $manage_service = true, + Boolean $enabled = true, + Boolean $manage_service = true, $package_ensure = 'present', $periodic_enable = $facts['os_service_default'], $periodic_fuzzy_delay = $facts['os_service_default'], diff -Nru puppet-module-sahara-22.0.0/metadata.json puppet-module-sahara-23.0.0/metadata.json --- puppet-module-sahara-22.0.0/metadata.json 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/metadata.json 2023-10-11 03:09:20.000000000 +0000 @@ -3,23 +3,23 @@ "dependencies": [ { "name": "openstack/keystone", - "version_requirement": ">=22.0.0 <23.0.0" + "version_requirement": ">=23.0.0 <24.0.0" }, { "name": "puppetlabs/inifile", - "version_requirement": ">=2.0.0 <6.0.0" + "version_requirement": ">=2.0.0 <7.0.0" }, { "name": "puppetlabs/stdlib", - "version_requirement": ">=5.0.0 <9.0.0" + "version_requirement": ">=5.0.0 <10.0.0" }, { "name": "openstack/openstacklib", - "version_requirement": ">=22.0.0 <23.0.0" + "version_requirement": ">=23.0.0 <24.0.0" }, { "name": "openstack/oslo", - "version_requirement": ">=22.0.0 <23.0.0" + "version_requirement": ">=23.0.0 <24.0.0" } ], "description": "Installs and configures OpenStack Sahara (Data Processing).", @@ -56,10 +56,10 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.0.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 8.0.0" } ], "source": "https://opendev.org/openstack/puppet-sahara.git", "summary": "Puppet module for OpenStack Sahara", - "version": "22.0.0" + "version": "23.0.0" } diff -Nru puppet-module-sahara-22.0.0/.pdkignore puppet-module-sahara-23.0.0/.pdkignore --- puppet-module-sahara-22.0.0/.pdkignore 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-sahara-23.0.0/.pdkignore 2023-10-11 03:09:20.000000000 +0000 @@ -0,0 +1,52 @@ +# common list used in puppetlabs repos +.git/ +.*.sw[op] +.metadata +.yardoc +.yardwarns +*.iml +/.bundle/ +/.idea/ +/.vagrant/ +/coverage/ +/bin/ +/doc/ +/Gemfile.local +/Gemfile.lock +/junit/ +/log/ +/pkg/ +/spec/fixtures/manifests/ +/spec/fixtures/modules/* +/tmp/ +/vendor/ +/convert_report.txt +/update_report.txt +.DS_Store +.project +.envrc +/inventory.yaml +/spec/fixtures/litmus_inventory.yaml +/.fixtures.yml +/Gemfile +/.gitattributes +/.gitignore +/.pdkignore +/.puppet-lint.rc +/Rakefile +/rakelib/ +/.rspec +/..yml +/.yardopts +/spec/ +/.vscode/ +/.sync.yml +/.devcontainer/ +# OpenStack-specific files +/bindep.txt +/.gitreview +/releasenotes/ +/setup.cfg +/setup.py +/tox.ini +/.zuul.yaml diff -Nru puppet-module-sahara-22.0.0/README.md puppet-module-sahara-23.0.0/README.md --- puppet-module-sahara-22.0.0/README.md 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/README.md 2023-10-11 03:09:20.000000000 +0000 @@ -50,7 +50,7 @@ To use the sahara module's functionality you will need to declare multiple resources. This is not an exhaustive list of all the components needed; we recommend you consult and understand the -[core of openstack](http://docs.openstack.org) documentation. +[core of openstack](https://docs.openstack.org) documentation. Examples of usage can be found in the *examples* directory. diff -Nru puppet-module-sahara-22.0.0/releasenotes/notes/rabbit-quorum-queue-b158cb7190931c19.yaml puppet-module-sahara-23.0.0/releasenotes/notes/rabbit-quorum-queue-b158cb7190931c19.yaml --- puppet-module-sahara-22.0.0/releasenotes/notes/rabbit-quorum-queue-b158cb7190931c19.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-sahara-23.0.0/releasenotes/notes/rabbit-quorum-queue-b158cb7190931c19.yaml 2023-10-11 03:09:20.000000000 +0000 @@ -0,0 +1,4 @@ +--- +features: + - | + The ``sahara`` class now supports options for quorum queues in RabbitMQ. diff -Nru puppet-module-sahara-22.0.0/releasenotes/notes/remove-puppet-6-0827f6c57fe04b35.yaml puppet-module-sahara-23.0.0/releasenotes/notes/remove-puppet-6-0827f6c57fe04b35.yaml --- puppet-module-sahara-22.0.0/releasenotes/notes/remove-puppet-6-0827f6c57fe04b35.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-sahara-23.0.0/releasenotes/notes/remove-puppet-6-0827f6c57fe04b35.yaml 2023-10-11 03:09:20.000000000 +0000 @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Puppet 6 is no longer supported. diff -Nru puppet-module-sahara-22.0.0/releasenotes/source/2023.1.rst puppet-module-sahara-23.0.0/releasenotes/source/2023.1.rst --- puppet-module-sahara-22.0.0/releasenotes/source/2023.1.rst 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-sahara-23.0.0/releasenotes/source/2023.1.rst 2023-10-11 03:09:20.000000000 +0000 @@ -0,0 +1,6 @@ +=========================== +2023.1 Series Release Notes +=========================== + +.. release-notes:: + :branch: stable/2023.1 diff -Nru puppet-module-sahara-22.0.0/releasenotes/source/index.rst puppet-module-sahara-23.0.0/releasenotes/source/index.rst --- puppet-module-sahara-22.0.0/releasenotes/source/index.rst 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/releasenotes/source/index.rst 2023-10-11 03:09:20.000000000 +0000 @@ -9,6 +9,7 @@ :maxdepth: 2 unreleased + 2023.1 zed yoga xena diff -Nru puppet-module-sahara-22.0.0/spec/classes/sahara_init_spec.rb puppet-module-sahara-23.0.0/spec/classes/sahara_init_spec.rb --- puppet-module-sahara-22.0.0/spec/classes/sahara_init_spec.rb 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/spec/classes/sahara_init_spec.rb 2023-10-11 03:09:20.000000000 +0000 @@ -34,13 +34,32 @@ it { is_expected.to contain_sahara_config('DEFAULT/host').with_value('') } it { is_expected.to contain_sahara_config('DEFAULT/port').with_value('') } it { is_expected.to contain_sahara_config('DEFAULT/plugins').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_compression').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('') } - it { is_expected.to contain_sahara_config('DEFAULT/transport_url').with_value('') } - it { is_expected.to contain_sahara_config('DEFAULT/control_exchange').with_value('') } - it { is_expected.to contain_sahara_config('DEFAULT/rpc_response_timeout').with_value('') } + + it { is_expected.to contain_oslo__messaging__rabbit('sahara_config').with( + :rabbit_use_ssl => '', + :heartbeat_timeout_threshold => '', + :heartbeat_rate => '', + :heartbeat_in_pthread => '', + :kombu_reconnect_delay => '', + :kombu_failover_strategy => '', + :amqp_durable_queues => '', + :kombu_compression => '', + :kombu_ssl_ca_certs => '', + :kombu_ssl_certfile => '', + :kombu_ssl_keyfile => '', + :kombu_ssl_version => '', + :rabbit_ha_queues => '', + :rabbit_retry_interval => '', + :rabbit_quorum_queue => '', + :rabbit_quorum_delivery_limit => '', + :rabbit_quorum_max_memory_length => '', + :rabbit_quorum_max_memory_bytes => '', + ) } + it { is_expected.to contain_oslo__messaging__default('sahara_config').with( + :transport_url => '', + :rpc_response_timeout => '', + :control_exchange => '' + ) } it { is_expected.to contain_sahara_config('DEFAULT/default_ntp_server').with_value('') } end @@ -67,30 +86,36 @@ end shared_examples 'sahara rpc' do - - context 'when defaults with rabbit pass specified' do - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') } - end - context 'when passing params' do before do params.merge!({ - :rabbit_ha_queues => 'true', - :amqp_durable_queues => 'true', - :rabbit_heartbeat_in_pthread => 'true', - :kombu_reconnect_delay => '1.0', - :kombu_compression => 'gzip', - :kombu_failover_strategy => 'round-robin', + :rabbit_ha_queues => true, + :amqp_durable_queues => true, + :rabbit_heartbeat_in_pthread => true, + :kombu_reconnect_delay => '1.0', + :kombu_compression => 'gzip', + :kombu_failover_strategy => 'round-robin', + :rabbit_quorum_queue => true, + :rabbit_quorum_delivery_limit => 3, + :rabbit_quorum_max_memory_length => 5, + :rabbit_quorum_max_memory_bytes => 1073741824, }) end - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('true') } - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('true') } - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('true') } - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('1.0') } - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_compression').with_value('gzip') } - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('round-robin') } + it { is_expected.to contain_oslo__messaging__rabbit('sahara_config').with( + :rabbit_use_ssl => '', + :heartbeat_timeout_threshold => '', + :heartbeat_rate => '', + :heartbeat_in_pthread => true, + :kombu_reconnect_delay => '1.0', + :kombu_failover_strategy => 'round-robin', + :amqp_durable_queues => true, + :kombu_compression => 'gzip', + :rabbit_quorum_queue => true, + :rabbit_quorum_delivery_limit => 3, + :rabbit_quorum_max_memory_length => 5, + :rabbit_quorum_max_memory_bytes => 1073741824, + ) } end context 'with rabbit ssl cert parameters' do @@ -115,43 +140,34 @@ context 'with rabbit ssl disabled' do before do params.merge!({ - :rabbit_use_ssl => false, + :rabbit_use_ssl => false, }) end it { is_expected.to contain_oslo__messaging__rabbit('sahara_config').with( - :rabbit_use_ssl => false, + :rabbit_use_ssl => false, )} end - context 'when passing params for single rabbit host' do - before do - params.merge!({ - :rabbit_ha_queues => true, - }) - end - - it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('true') } - end - context 'with amqp rpc' do context 'with default parameters' do - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/server_request_prefix').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/broadcast_prefix').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/group_request_prefix').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/container_name').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/idle_timeout').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/trace').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/ssl_ca_file').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/ssl_cert_file').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/ssl_key_file').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/ssl_key_password').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/sasl_mechanisms').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/sasl_config_dir').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/sasl_config_name').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/username').with_value('') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/password').with_value('') } + it { is_expected.to contain_oslo__messaging__amqp('sahara_config').with( + :server_request_prefix => '', + :broadcast_prefix => '', + :group_request_prefix => '', + :container_name => '', + :idle_timeout => '', + :trace => '', + :ssl_ca_file => '', + :ssl_cert_file => '', + :ssl_key_file => '', + :sasl_mechanisms => '', + :sasl_config_dir => '', + :sasl_config_name => '', + :username => '', + :password => '', + )} end context 'when pass parameters' do @@ -167,22 +183,24 @@ }) end - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/idle_timeout').with_value('60') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/trace').with_value('true') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/ssl_ca_file').with_value('/etc/ca.cert') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/ssl_cert_file').with_value('/etc/certfile') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/ssl_key_file').with_value('/etc/key') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/username').with_value('amqp_user') } - it { is_expected.to contain_sahara_config('oslo_messaging_amqp/password').with_value('password') } + it { is_expected.to contain_oslo__messaging__amqp('sahara_config').with( + :idle_timeout => '60', + :trace => true, + :ssl_ca_file => '/etc/ca.cert', + :ssl_cert_file => '/etc/certfile', + :ssl_key_file => '/etc/key', + :username => 'amqp_user', + :password => 'password', + )} end end end shared_examples 'sahara ssl' do context 'without ssl' do - it { is_expected.to_not contain_sahara_config('ssl/ca_file') } - it { is_expected.to_not contain_sahara_config('ssl/cert_file') } - it { is_expected.to_not contain_sahara_config('ssl/key_file') } + it { is_expected.to contain_sahara_config('ssl/ca_file').with_ensure('absent') } + it { is_expected.to contain_sahara_config('ssl/cert_file').with_ensure('absent') } + it { is_expected.to contain_sahara_config('ssl/key_file').with_ensure('absent') } end context 'with ssl' do diff -Nru puppet-module-sahara-22.0.0/spec/classes/sahara_policy_spec.rb puppet-module-sahara-23.0.0/spec/classes/sahara_policy_spec.rb --- puppet-module-sahara-22.0.0/spec/classes/sahara_policy_spec.rb 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/spec/classes/sahara_policy_spec.rb 2023-10-11 03:09:20.000000000 +0000 @@ -33,6 +33,7 @@ :file_group => 'sahara', :file_format => 'yaml', :purge_config => false, + :tag => 'sahara', ) is_expected.to contain_oslo__policy('sahara_config').with( :enforce_scope => false, @@ -63,6 +64,7 @@ :file_group => 'sahara', :file_format => 'yaml', :purge_config => true, + :tag => 'sahara', ) is_expected.to contain_oslo__policy('sahara_config').with( :enforce_scope => false, diff -Nru puppet-module-sahara-22.0.0/spec/spec_helper.rb puppet-module-sahara-23.0.0/spec/spec_helper.rb --- puppet-module-sahara-22.0.0/spec/spec_helper.rb 2023-03-23 15:51:06.000000000 +0000 +++ puppet-module-sahara-23.0.0/spec/spec_helper.rb 2023-10-11 03:09:20.000000000 +0000 @@ -12,9 +12,6 @@ c.alias_it_should_behave_like_to :it_raises, 'raises' c.module_path = File.join(fixture_path, 'modules') - c.manifest_dir = File.join(fixture_path, 'manifests') - - c.mock_with :rspec end at_exit { RSpec::Puppet::Coverage.report! }