From 938d90912bdbbd736da76038fcc61df24cf752fe Mon Sep 17 00:00:00 2001 From: Kenyon Ralph Date: Tue, 6 Dec 2022 17:44:53 -0800 Subject: [PATCH] revert #258, purge_unmanaged_repos This method of purging unmanaged yum repo configs does not work. Fixes #285 --- manifests/init.pp | 20 -------------------- spec/classes/init_spec.rb | 3 +-- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 20cc67c..60b7c21 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -55,12 +55,6 @@ # @param utils_package_name # Name of the utils package, e.g. 'yum-utils', or 'dnf-utils'. # -# @param purge_unmanaged_repos -# Should repos not managed by puppet be removed? -# -# @param repodir -# Where are repos stored on this system? -# # @example Enable management of the default repos for a supported OS: # --- # yum::manage_os_default_repos: true @@ -111,8 +105,6 @@ Array[String] $repo_exclusions = [], Hash[String, Hash[String, String]] $gpgkeys = {}, String $utils_package_name = 'yum-utils', - Boolean $purge_unmanaged_repos = false, - Stdlib::Unixpath $repodir = '/etc/yum.repos.d', ) { $module_metadata = load_module_metadata($module_name) $supported_operatingsystems = $module_metadata['operatingsystem_support'] @@ -120,18 +112,6 @@ $os['operatingsystem'] } - if $purge_unmanaged_repos { - file { $repodir: - ensure => 'directory', - owner => 'root', - group => 'root', - mode => '0644', - recurse => true, - recurselimit => 1, - purge => true, - } - } - unless member($supported_os_names, $facts['os']['name']) { fail("${facts['os']['name']} not supported") } diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index c1b0155..255fc11 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -618,10 +618,9 @@ end context 'to an array of all supported repos' do - let(:params) { { managed_repos: supported_repos, purge_unmanaged_repos: true } } + let(:params) { { managed_repos: supported_repos } } it { is_expected.to compile.with_all_deps } - it { is_expected.to contain_file('/etc/yum.repos.d').with_purge(true) } it { is_expected.to have_yumrepo_resource_count(supported_repos.count) } it_behaves_like 'a catalog containing repos', supported_repos