.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '5.5.0'
+modulesync_config_version: '6.0.0'

CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
+## [v9.1.0](https://github.com/voxpupuli/puppet-redis/tree/v9.1.0) (2023-07-29)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-redis/compare/v9.0.0...v9.1.0)
+
+**Implemented enhancements:**
+
+- puppetlabs/stdlib: Allow 9.x [\#483](https://github.com/voxpupuli/puppet-redis/pull/483) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- Add Rocky/AlmaLinux support [\#487](https://github.com/voxpupuli/puppet-redis/pull/487) ([bastelfreak](https://github.com/bastelfreak))
+- Specify environment module path for bolt [\#475](https://github.com/voxpupuli/puppet-redis/pull/475) ([traylenator](https://github.com/traylenator))
+
 ## [v9.0.0](https://github.com/voxpupuli/puppet-redis/tree/v9.0.0) (2023-06-01)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-redis/compare/v8.8.0...v9.0.0)

Gemfile

@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.4',   :require => false
+  gem 'voxpupuli-test', '~> 6.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 2.0',  :require => false
+  gem 'puppet_metadata', '~> 3.0',  :require => false
   gem 'redis',                      :require => false
   gem 'mock_redis',                 :require => false
 end
@@ -18,18 +18,19 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false if RUBY_VERSION >= '2.5'
-  gem 'voxpupuli-release', '~> 2.0',              :require => false
+  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
+  gem 'voxpupuli-release', '~> 3.0',              :require => false
+  gem 'faraday-retry', '~> 2.1',                  :require => false
 end
 
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppet-redis",
-  "version": "9.0.0",
+  "version": "9.1.0",
   "author": "Vox Pupuli",
   "summary": "Redis module",
   "license": "Apache-2.0",
@@ -10,11 +10,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 8.4.0 < 9.0.0"
+      "version_requirement": ">= 8.4.0 < 10.0.0"
     },
     {
       "name": "puppet/systemd",
-      "version_requirement": ">= 2.0.0 < 5.0.0"
+      "version_requirement": ">= 2.0.0 < 6.0.0"
     }
   ],
   "description": "Redis module with cluster support",
@@ -61,6 +61,20 @@
         "8",
         "9"
       ]
+    },
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8",
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "8",
+        "9"
+      ]
     }
   ]
 }

spec/acceptance/redis_cli_task_spec.rb

@@ -4,7 +4,7 @@
 
 describe 'redis-cli task' do
   subject do
-    on(default, "bolt task run --modulepath /etc/puppetlabs/code/modules --targets localhost #{task_name} #{params}", acceptable_exit_codes: [0, 1]).stdout
+    on(default, "bolt task run --modulepath /etc/puppetlabs/code/environments/production/modules --targets localhost #{task_name} #{params}", acceptable_exit_codes: [0, 1]).stdout
   end
 
   let(:task_name) { 'redis::redis_cli' }

spec/acceptance/suites/scl/redis5_spec.rb

@@ -4,11 +4,11 @@
 
 describe 'redis', if: %w[centos redhat].include?(os[:family]) && os[:release].to_i == 7 do
   before(:all) do
-    on hosts, puppet_resource('service', 'redis', 'ensure=stopped', 'enable=false')
+    apply_manifest_on(hosts, 'service{"redis" : ensure => stopped, enable => false}')
   end
 
   after(:all) do
-    on hosts, puppet_resource('service', 'rh-redis5-redis', 'ensure=stopped', 'enable=false')
+    apply_manifest('service{"rh-redis5-redis" : ensure => stopped, enable => false}')
   end
 
   it 'runs successfully' do

spec/spec_helper_acceptance.rb

@@ -4,17 +4,17 @@
 
 configure_beaker do |host|
   # sysctl is untestable in docker
-  install_module_from_forge_on(host, 'puppet/augeasproviders_sysctl', '>= 3.0.0 < 4.0.0') unless host['hypervisor'] == 'docker'
+  install_puppet_module_via_pmt_on(host, 'puppet-augeasproviders_sysctl') unless host['hypervisor'] == 'docker'
+  install_puppet_module_via_pmt_on(host, 'puppet-epel') if fact_on(host, 'os.family') == 'RedHat' && fact_on(host, 'os.release.major').to_i == 7
 
-  install_module_from_forge_on(host, 'puppet/epel', '>= 3.0.0') if fact_on(host, 'osfamily') == 'RedHat' && fact_on(host, 'operatingsystemmajrelease').to_i == 7
-  unless fact_on(host, 'osfamily') == 'RedHat' && fact_on(host, 'operatingsystemmajrelease').to_i >= 9
+  unless fact_on(host, 'os.family') == 'RedHat' && fact_on(host, 'os.release.major').to_i >= 9
     # puppet-bolt rpm for CentOS 9 is not yet available
     # https://tickets.puppetlabs.com/browse/MODULES-11275
     host.install_package('puppet-bolt')
   end
 
-  if fact_on(host, 'osfamily') == 'Debian'
+  if fact_on(host, 'os.family') == 'Debian'
     # APT required for Debian based systems where `$redis::manage_repo` is `true`
-    install_module_from_forge_on(host, 'puppetlabs/apt', '>= 9.0.0')
+    install_puppet_module_via_pmt_on(host, 'puppetlabs-apt')
   end
 end