diff --git a/manifests/repos/yum.pp b/manifests/repos/yum.pp index dcc9401d8..52922a176 100644 --- a/manifests/repos/yum.pp +++ b/manifests/repos/yum.pp @@ -38,11 +38,8 @@ gpgcheck => '0', enabled => '0', } + # Foreman 2.0 dropped the separate rails repository yumrepo { "${name}-rails": - descr => "Rails SCL for Foreman ${repo}", - baseurl => "https://yum.theforeman.org/rails/foreman-${repo}/${yumcode}/\$basearch", - gpgcheck => $gpgcheck_enabled, - enabled => '1', - gpgkey => "https://yum.theforeman.org/rails/foreman-${repo}/RPM-GPG-KEY-copr", + ensure => absent, } } diff --git a/spec/defines/foreman_repos_yum_spec.rb b/spec/defines/foreman_repos_yum_spec.rb index 8007f399e..82cbb3a1a 100644 --- a/spec/defines/foreman_repos_yum_spec.rb +++ b/spec/defines/foreman_repos_yum_spec.rb @@ -37,12 +37,7 @@ .with_gpgcheck('0') .with_enabled('0') - should contain_yumrepo('foreman-rails') - .with_descr('Rails SCL for Foreman nightly') - .with_baseurl('https://yum.theforeman.org/rails/foreman-nightly/el7/$basearch') - .with_gpgcheck('0') - .with_enabled('1') - .with_gpgkey('https://yum.theforeman.org/rails/foreman-nightly/RPM-GPG-KEY-copr') + should contain_yumrepo('foreman-rails').with_ensure('absent') end end @@ -76,12 +71,7 @@ .with_gpgcheck('0') .with_enabled('0') - should contain_yumrepo('foreman-rails') - .with_descr('Rails SCL for Foreman nightly') - .with_baseurl('https://yum.theforeman.org/rails/foreman-nightly/el7/$basearch') - .with_gpgcheck('0') - .with_enabled('1') - .with_gpgkey('https://yum.theforeman.org/rails/foreman-nightly/RPM-GPG-KEY-copr') + should contain_yumrepo('foreman-rails').with_ensure('absent') end end end @@ -119,12 +109,7 @@ .with_gpgcheck('0') .with_enabled('0') - should contain_yumrepo('foreman-rails') - .with_descr('Rails SCL for Foreman 1.19') - .with_baseurl('https://yum.theforeman.org/rails/foreman-1.19/el7/$basearch') - .with_gpgcheck('1') - .with_enabled('1') - .with_gpgkey('https://yum.theforeman.org/rails/foreman-1.19/RPM-GPG-KEY-copr') + should contain_yumrepo('foreman-rails').with_ensure('absent') end end @@ -158,12 +143,7 @@ .with_gpgcheck('0') .with_enabled('0') - should contain_yumrepo('foreman-rails') - .with_descr('Rails SCL for Foreman 1.19') - .with_baseurl('https://yum.theforeman.org/rails/foreman-1.19/el7/$basearch') - .with_gpgcheck('0') - .with_enabled('1') - .with_gpgkey('https://yum.theforeman.org/rails/foreman-1.19/RPM-GPG-KEY-copr') + should contain_yumrepo('foreman-rails').with_ensure('absent') end end end