From 45ae2d9dd2bdc1b7e6e14e708e41d198dbe68d40 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 16 Aug 2023 17:00:19 +0200 Subject: [PATCH 1/5] Allow new cvmfs-libs package Since cvmfs 2.10.0 was released the cvmfs packages have spawned a new sub package cvmfs-libs. On RedHat where the package list is restricted allow this package to be installed. Resolves ``` Aug 16 16:57:15 lx.example.ch dnf-distro-sync[1230631]: - cannot install the best update candidate for package cvmfs-2.10.1-1.el9.x86_64 Aug 16 16:57:15 lx.example.ch dnf-distro-sync[1230631]: - package cvmfs-libs-2.11.0-1.el9.x86_64 is filtered out by exclude filtering ``` --- data/os/RedHat.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/os/RedHat.yaml b/data/os/RedHat.yaml index 957d357..7f5df90 100644 --- a/data/os/RedHat.yaml +++ b/data/os/RedHat.yaml @@ -4,6 +4,7 @@ cvmfs::repo_base: https://cvmrepo.s3.cern.ch/cvmrepo/yum cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM cvmfs::repo_includepkgs: - cvmfs-keys + - cvmfs-libs - cvmfs - cvmfs-config-default - cvmfs-fuse3 From 4a2b3dfc30790bb65e3f7d8362196236449f73d5 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 16 Aug 2023 17:08:48 +0200 Subject: [PATCH 2/5] lint fix on parameter oder --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index d96228a..b79f2dc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -120,6 +120,7 @@ Stdlib::Httpurl $repo_base, Stdlib::Httpurl $repo_gpgkey, Variant[Undef,String] $cvmfs_http_proxy, + Optional[Variant[Enum['absent'], Array[String[1]]]] $repo_includepkgs, Enum['autofs','mount','none'] $mount_method = 'autofs', Boolean $manage_autofs_service = true, Integer $default_cvmfs_partsize = 10000, @@ -151,7 +152,6 @@ Boolean $repo_testing_enabled = false, Optional[Stdlib::Httpurl] $repo_proxy = undef, Boolean $repo_gpgcheck = true, - Optional[Variant[Enum['absent'], Array[String[1]]]] $repo_includepkgs, Optional[Enum['yes','no']] $cvmfs_use_geoapi = undef, Optional[Enum['yes','no']] $cvmfs_follow_redirects = undef, Boolean $cvmfs_instrument_fuse = false, From 22dda23eb659fd5a01af5c1ef61513ccbfff8859 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 16 Aug 2023 17:09:41 +0200 Subject: [PATCH 3/5] typo on strings param --- REFERENCE.md | 8 ++++++++ manifests/init.pp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/REFERENCE.md b/REFERENCE.md index 20eb9d6..d4c6e1f 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -62,6 +62,14 @@ cvmfs::domain{'example.net' } ``` +##### Use fuse3 version of cvmfs + +```puppet +class{'cvmfs': + fuse3 => true, +} +``` + ##### Use Mount rather than AutoFS ```puppet diff --git a/manifests/init.pp b/manifests/init.pp index b79f2dc..8a6fc2c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -20,7 +20,7 @@ # cvmfs_server_url => 'http://web.example.org/cvmfs/@fqrn@' # } # -# @wxample Use fuse3 version of cvmfs +# @example Use fuse3 version of cvmfs # class{'cvmfs': # fuse3 => true, # } From 08c315edb77f096328df47eba5e1f8ddca992d00 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 16 Aug 2023 17:15:56 +0200 Subject: [PATCH 4/5] Allow puppetlabs-concat version 9 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 8def70a..1ae4ef8 100644 --- a/metadata.json +++ b/metadata.json @@ -16,7 +16,7 @@ "name": "puppetlabs/apt" }, { - "version_requirement": ">= 1.0.0 < 9.0.0", + "version_requirement": ">= 1.0.0 < 10.0.0", "name": "puppetlabs/concat" }, { From caa313a66fd6cd6ccbaa9927f4eca27b4f54224a Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 2 Jul 2023 23:41:10 +0200 Subject: [PATCH 5/5] Add Puppet 8 support --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 1ae4ef8..778019c 100644 --- a/metadata.json +++ b/metadata.json @@ -80,7 +80,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 7.0.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 9.0.0" } ] }