Merge pull request voxpupuli#209 from traylenator/fuse3

Remove fuse3 parameter

Author: traylenator

REFERENCE.md

@@ -62,14 +62,6 @@ cvmfs::domain{'example.net'
 }
 ```
 
-##### Use fuse3 version of cvmfs
-
-```puppet
-class{'cvmfs':
-  fuse3 => true,
-}
-```
-
 ##### Use Mount rather than AutoFS
 
 ```puppet
@@ -157,7 +149,6 @@ The following parameters are available in the `cvmfs` class:
 * [`cvmfs_fsck`](#-cvmfs--cvmfs_fsck)
 * [`cvmfs_fsck_options`](#-cvmfs--cvmfs_fsck_options)
 * [`cvmfs_fsck_onreboot`](#-cvmfs--cvmfs_fsck_onreboot)
-* [`fuse3`](#-cvmfs--fuse3)
 * [`cvmfs_cache_symlinks`](#-cvmfs--cvmfs_cache_symlinks)
 * [`cvmfs_streaming_cache`](#-cvmfs--cvmfs_streaming_cache)
 * [`cvmfs_statfs_cache_timeout`](#-cvmfs--cvmfs_statfs_cache_timeout)
@@ -573,16 +564,6 @@ Should fsck be run after every reboot
 
 Default value: `false`
 
-##### <a name="-cvmfs--fuse3"></a>`fuse3`
-
-Data type: `Optional[Boolean]`
-
-Install or disable fuse3 variant of cvmfs, if left `undef` no change will be made. Note that changing
-this value when CVMFS mounts are active may well destroy those mounts.
-Not availabe on Ubuntu 18.04.
-
-Default value: `undef`
-
 ##### <a name="-cvmfs--cvmfs_cache_symlinks"></a>`cvmfs_cache_symlinks`
 
 Data type: `Optional[Enum['yes','no']]`

manifests/init.pp

@@ -20,11 +20,6 @@
 #     cvmfs_server_url => 'http://web.example.org/cvmfs/@fqrn@'
 #   }
 #
-# @example Use fuse3 version of cvmfs
-#   class{'cvmfs':
-#     fuse3 => true,
-#   }
-#
 # @example Use Mount rather than AutoFS
 #   class{'cvmfs':
 #     mount_method => 'mount',
@@ -116,10 +111,6 @@
 # @param cvmfs_fsck Ensure the cvmfs::fsck class is included.
 # @param cvmfs_fsck_options Any extra options for cvmfs fsck
 # @param cvmfs_fsck_onreboot Should fsck be run after every reboot
-# @param fuse3
-#   Install or disable fuse3 variant of cvmfs, if left `undef` no change will be made. Note that changing
-#   this value when CVMFS mounts are active may well destroy those mounts.
-#   Not availabe on Ubuntu 18.04.
 # @param cvmfs_cache_symlinks If set to yes, enables symlink caching in the kernel.
 # @param cvmfs_streaming_cache If set to yes, use a download manager to download regular files on read.
 # @param cvmfs_statfs_cache_timeout Caching time of statfs() in seconds (no caching by default).
@@ -192,7 +183,6 @@
   Boolean $cvmfs_fsck                                                 = false,
   Optional[String] $cvmfs_fsck_options                                = undef,
   Boolean $cvmfs_fsck_onreboot                                        = false,
-  Optional[Boolean] $fuse3                                            = undef,
   Optional[Enum['yes','no']] $cvmfs_cache_symlinks                    = undef,
   Optional[Enum['yes','no']] $cvmfs_cache_refcount                    = undef,
   Optional[Enum['yes','no']] $cvmfs_streaming_cache                   = undef,
@@ -234,10 +224,6 @@
     }
   }
 
-  if $fuse3 =~ Boolean and  $facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '18.04' {
-    fail('Ubuntu 18.04 does not have fuse3 available')
-  }
-
   if $repo_manage {
     case $facts['os']['family'] {
       'RedHat': {
@@ -251,9 +237,6 @@
         Class['cvmfs::apt'] -> Class['cvmfs::install']
         # Needed since apt::update is only notified in apt::source, but not contained.
         Class['apt::update'] -> Package['cvmfs']
-        if $fuse3 {
-          Class['apt::update'] -> Package['cvmfs-fuse3']
-        }
       }
       default: { fail('Only repositories for RedHat or Debian family can be managed') }
     }

manifests/install.pp

@@ -4,7 +4,6 @@
 class cvmfs::install (
   String[1] $cvmfs_version = $cvmfs::cvmfs_version,
   Stdlib::Absolutepath $cvmfs_cache_base = $cvmfs::cvmfs_cache_base,
-  Optional[Boolean] $fuse3 = $cvmfs::fuse3,
   Optional[Enum['yes','no']] $cvmfs_claim_ownership = $cvmfs::cvmfs_claim_ownership,
 ) inherits cvmfs {
   # Create the cache dir if one is defined, otherwise assume default is in the package.
@@ -30,12 +29,6 @@
     ensure => $cvmfs_version,
   }
 
-  if $fuse3 =~ Boolean {
-    package { 'cvmfs-fuse3':
-      ensure => bool2str($fuse3,$cvmfs_version,'absent'),
-    }
-  }
-
   # Create a file for the cvmfs
   file { '/etc/cvmfs/cvmfsfacts.yaml':
     ensure  => file,

spec/acceptance/cvmfs_cvmfs3_spec.rb

@@ -29,7 +29,6 @@
         it { is_expected.not_to contain_file('/etc/cvmfs/config.d/default.gid_map') }
         it { is_expected.to contain_concat__fragment('cvmfs_default_local_header').without_content(%r{^CVMFS_UID_MAP.*$}) }
         it { is_expected.to contain_concat__fragment('cvmfs_default_local_header').without_content(%r{^CVMFS_GID_MAP.*$}) }
-        it { is_expected.not_to contain_package('fuse3') }
 
         case facts[:os]['family']
         when 'Debian'
@@ -42,32 +41,6 @@
           it { is_expected.to contain_package('cvmfs').that_requires('Class[cvmfs::yum]') }
         end
 
-        context 'with fuse3 set true' do
-          let(:params) do
-            super().merge(fuse3: true)
-          end
-
-          case [facts[:os]['name'], facts[:os]['release']['major']]
-          when ['Ubuntu', '18.04']
-            it { is_expected.to compile.and_raise_error(%r{does not have fuse3}) }
-          else
-            it { is_expected.to contain_package('cvmfs-fuse3').with_ensure('present') }
-          end
-        end
-
-        context 'with fuse3 set false' do
-          let(:params) do
-            super().merge(fuse3: false)
-          end
-
-          case [facts[:os]['name'], facts[:os]['release']['major']]
-          when ['Ubuntu', '18.04']
-            it { is_expected.to compile.and_raise_error(%r{does not have fuse3}) }
-          else
-            it { is_expected.to contain_package('cvmfs-fuse3').with_ensure('absent') }
-          end
-        end
-
         context 'with cvmfs_http_proxy set' do
           let(:params) do
             super().merge(cvmfs_http_proxy: 'http://foobar.example.org:3128')