From 907200ba262b5ed0e4a78a116d5e31052d3d1bb8 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 23 Sep 2024 16:09:36 +0200 Subject: [PATCH] stop removing ansible runner yumrepo we stopped using it a long time ago, and had it on "absent" for a while. --- manifests/plugin/ansible/runner.pp | 7 ------- spec/classes/foreman_proxy__plugin__ansible_spec.rb | 7 ------- 2 files changed, 14 deletions(-) diff --git a/manifests/plugin/ansible/runner.pp b/manifests/plugin/ansible/runner.pp index fdec19000..8111f5b85 100644 --- a/manifests/plugin/ansible/runner.pp +++ b/manifests/plugin/ansible/runner.pp @@ -5,13 +5,6 @@ class foreman_proxy::plugin::ansible::runner ( String $package_name = $foreman_proxy::plugin::ansible::runner_package_name, ) { - if $facts['os']['family'] == 'RedHat' { - yumrepo { 'ansible-runner': - ensure => absent, - before => Package[$package_name], - } - } - package { $package_name: ensure => 'installed', } diff --git a/spec/classes/foreman_proxy__plugin__ansible_spec.rb b/spec/classes/foreman_proxy__plugin__ansible_spec.rb index 10f43c1e5..68a187b09 100644 --- a/spec/classes/foreman_proxy__plugin__ansible_spec.rb +++ b/spec/classes/foreman_proxy__plugin__ansible_spec.rb @@ -16,11 +16,6 @@ it { should contain_package('python3-ansible-runner').with_ensure('installed') } it { should contain_package('ansible-collection-theforeman-foreman').with_ensure('installed') } when 'redhat-7-x86_64' - it 'should include ansible-runner upstream repo' do - should contain_yumrepo('ansible-runner') - .with_ensure('absent') - .that_comes_before('Package[ansible-runner]') - end it { should contain_package('ansible-runner').with_ensure('installed') } it { should contain_package('ansible-collection-theforeman-foreman').with_ensure('installed') } end @@ -68,7 +63,6 @@ it { should_not contain_apt__source('ansible-runner') } it { should contain_package('python3-ansible-runner').with_ensure('installed') } when 'redhat-7-x86_64' - it { should_not contain_yumrepo('ansible-runner') } it { should contain_package('ansible-runner').with_ensure('installed') } end @@ -105,7 +99,6 @@ it 'should not contain ansible-runner' do should_not contain_class('foreman_proxy::plugin::ansible::runner') should_not contain_apt__source('ansible-runner') - should_not contain_yumrepo('ansible-runner') should_not contain_package('ansible-runner') should_not contain_package('python3-ansible-runner') end