Merge pull request #252 from maxadamo/master

Revert "remove repo for Ubuntu 22.04"
voxpupuli · Oct 25, 2023 · b06fc9f · b06fc9f
2 parents 40f7018 + d603a3e
commit b06fc9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -35,11 +35,7 @@
       $service_name = 'glusterd'
     }
     'Debian': {
-      # Ubuntu 22.04 includes GlusterFS in the base repositories
-      $repo = "${facts['os']['name']}_${facts['os']['release']['major']}" ? {
-        'Ubuntu_22.04' => false,
-        default => true
-      }
+      $repo           = true
       $server_package = 'glusterfs-server'
       $client_package = 'glusterfs-client'
       $service_name   = 'glusterd'

diff --git a/spec/classes/repo_apt_spec.rb b/spec/classes/repo_apt_spec.rb
@@ -4,8 +4,7 @@
 
 describe 'gluster::repo::apt', type: :class do
   on_supported_os.each do |os, os_facts|
-    # Ubuntu 22.04 does not require a repo
-    context "on #{os}", if: os_facts[:os]['family'] == 'Debian' and os_facts[:os]['release']['major'] != '22.04' do
+    context "on #{os}", if: os_facts[:os]['family'] == 'Debian' do
       let(:facts) { os_facts }
       let(:pre_condition) { 'require gluster::params' }