Merge pull request #180 from traylenator/libs

Allow new cvmfs-libs package
voxpupuli · Aug 17, 2023 · eca5370 · eca5370
2 parents a0f411f + caa313a
commit eca5370
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git 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/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
diff --git 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,
 #   }
@@ -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,

diff --git 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"
     },
     {
@@ -80,7 +80,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ]
 }