Merge pull request #646 from bastelfreak/ol

Add AlmaLinux/Rocky support
voxpupuli · Oct 31, 2023 · 4009a42 · 4009a42
2 parents 8601c6f + 2b03f86
commit 4009a42
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 19 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -549,7 +549,7 @@ Data type: `String[1]`
 
 Specify version of consul binary to download.
 
-Default value: `'1.16.1'`
+Default value: `'1.16.3'`
 
 ##### <a name="-consul--watches"></a>`watches`
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -137,7 +137,7 @@
   Enum['stopped', 'running']            $service_ensure              = 'running',
   Hash                                  $services                    = {},
   String[1]                             $user                        = $consul::params::user,
-  String[1]                             $version                     = '1.16.1',
+  String[1]                             $version                     = '1.16.3',
   Hash                                  $watches                     = {},
   Optional[String[1]]                   $shell                       = $consul::params::shell,
   Boolean                               $enable_beta_ui              = false,

diff --git a/metadata.json b/metadata.json
@@ -39,14 +39,16 @@
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {
@@ -68,14 +70,30 @@
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8",
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "8",
+        "9"
       ]
     },
     {

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -46,7 +46,7 @@
       pp = <<-EOS
         package { 'unzip': ensure => present }
         -> class { 'consul':
-          version        => '1.16.1',
+          version        => '1.16.3',
           manage_service => true,
           config_hash    => {
               'datacenter' => 'east-aws',
@@ -73,7 +73,7 @@
     end
 
     describe command('consul version') do
-      its(:stdout) { is_expected.to match %r{Consul v1.16.1} }
+      its(:stdout) { is_expected.to match %r{Consul v1.16.3} }
     end
 
     describe file('/etc/consul/config.json') do
@@ -87,7 +87,7 @@
       pp = <<-EOS
         package { 'unzip': ensure => present }
         -> class { 'consul':
-          version        => '1.16.1',
+          version        => '1.16.3',
           manage_service => true,
           config_hash    => {
               'datacenter'  => 'east-aws',
@@ -117,7 +117,7 @@
     end
 
     describe command('consul version') do
-      its(:stdout) { is_expected.to match %r{Consul v1.16.1} }
+      its(:stdout) { is_expected.to match %r{Consul v1.16.3} }
     end
 
     describe file('/etc/consul/config.json') do
@@ -133,7 +133,7 @@
       pp = <<-EOS
         package { 'unzip': ensure => present }
         -> class { 'consul':
-          version        => '1.16.1',
+          version        => '1.16.3',
           manage_service => true,
           config_hash    => {
               'datacenter'         => 'east-aws',
@@ -207,7 +207,7 @@
     end
 
     describe command('consul version') do
-      its(:stdout) { is_expected.to match %r{Consul v1.16.1} }
+      its(:stdout) { is_expected.to match %r{Consul v1.16.3} }
     end
 
     describe command("consul acl token list --token #{acl_master_token} | grep Description") do

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -160,9 +160,9 @@
       end
 
       context 'When installing via URL by default' do
-        it { is_expected.to contain_archive('/opt/consul/archives/consul-1.16.1.zip').with(source: 'https://releases.hashicorp.com/consul/1.16.1/consul_1.16.1_linux_amd64.zip') }
+        it { is_expected.to contain_archive('/opt/consul/archives/consul-1.16.3.zip').with(source: 'https://releases.hashicorp.com/consul/1.16.3/consul_1.16.3_linux_amd64.zip') }
         it { is_expected.to contain_file('/opt/consul/archives').with(ensure: 'directory') }
-        it { is_expected.to contain_file('/opt/consul/archives/consul-1.16.1').with(ensure: 'directory') }
+        it { is_expected.to contain_file('/opt/consul/archives/consul-1.16.3').with(ensure: 'directory') }
         it { is_expected.to contain_file('/usr/local/bin/consul').that_notifies('Class[consul::run_service]') }
       end
 
@@ -173,20 +173,20 @@
           }
         end
 
-        it { is_expected.to contain_archive('/usr/share/puppet-archive/consul-1.16.1.zip').with(source: 'https://releases.hashicorp.com/consul/1.16.1/consul_1.16.1_linux_amd64.zip') }
+        it { is_expected.to contain_archive('/usr/share/puppet-archive/consul-1.16.3.zip').with(source: 'https://releases.hashicorp.com/consul/1.16.3/consul_1.16.3_linux_amd64.zip') }
         it { is_expected.to contain_file('/usr/share/puppet-archive').with(ensure: 'directory') }
-        it { is_expected.to contain_file('/usr/share/puppet-archive/consul-1.16.1').with(ensure: 'directory') }
+        it { is_expected.to contain_file('/usr/share/puppet-archive/consul-1.16.3').with(ensure: 'directory') }
         it { is_expected.to contain_file('/usr/local/bin/consul').that_notifies('Class[consul::run_service]') }
       end
 
       context 'When installing by archive via URL and current version is already installed' do
         let(:facts) do
           facts.merge({
-                        consul_version: '1.16.1'
+                        consul_version: '1.16.3'
                       })
         end
 
-        it { is_expected.to contain_archive('/opt/consul/archives/consul-1.16.1.zip').with(source: 'https://releases.hashicorp.com/consul/1.16.1/consul_1.16.1_linux_amd64.zip') }
+        it { is_expected.to contain_archive('/opt/consul/archives/consul-1.16.3.zip').with(source: 'https://releases.hashicorp.com/consul/1.16.3/consul_1.16.3_linux_amd64.zip') }
         it { is_expected.to contain_file('/usr/local/bin/consul') }
         it { is_expected.not_to contain_notify(['Class[consul::run_service]']) }
       end
@@ -209,7 +209,7 @@
           }
         end
 
-        it { is_expected.to contain_archive('/opt/consul/archives/consul-1.16.1.zip').with(source: 'http://myurl') }
+        it { is_expected.to contain_archive('/opt/consul/archives/consul-1.16.3.zip').with(source: 'http://myurl') }
         it { is_expected.to contain_file('/usr/local/bin/consul').that_notifies('Class[consul::run_service]') }
       end