From d603a3eb5c94be5c608939eb5eb6f5239198dec0 Mon Sep 17 00:00:00 2001 From: Massimiliano Adamo Date: Wed, 25 Oct 2023 22:00:13 +0200 Subject: [PATCH] Revert "remove repo for Ubuntu 22.04" This reverts commit 40f70186b66cb5ddfd96927aeab765aeee139891. --- manifests/params.pp | 6 +----- spec/classes/repo_apt_spec.rb | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 55312e95..058a4215 100644 --- 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 index 74792f3a..5925ddfb 100644 --- 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' }