diff --git a/site/profiles/manifests/defaults.pp b/site/profiles/manifests/defaults.pp index 1db27c8..c0b94a8 100644 --- a/site/profiles/manifests/defaults.pp +++ b/site/profiles/manifests/defaults.pp @@ -8,7 +8,9 @@ class profiles::defaults { } Package { - ensure => present, + ensure => present, + require => Class['profiles::base::repos'] + } File { @@ -29,6 +31,11 @@ class profiles::defaults { } Yumrepo { - require => Class['profiles::pki::vaultca'], + ensure => 'present', + enabled => 1, + gpgcheck => 1, + mirrorlist => 'absent', + require => Class['profiles::pki::vaultca'], + notify => Exec['dnf_makecache'], } } diff --git a/site/profiles/manifests/yum/global.pp b/site/profiles/manifests/yum/global.pp index 2296b7f..44c393c 100644 --- a/site/profiles/manifests/yum/global.pp +++ b/site/profiles/manifests/yum/global.pp @@ -52,13 +52,6 @@ class profiles::yum::global ( }, } - Yumrepo { - ensure => 'present', - enabled => 1, - gpgcheck => 1, - mirrorlist => 'absent', - } - resources { 'yumrepo': purge => $purge, } @@ -102,6 +95,13 @@ class profiles::yum::global ( require => Class['profiles::pki::vaultca'], } + # makecache if changes made to repos + exec {'dnf_makecache': + command => 'dnf makecache -q', + path => ['/usr/bin', '/bin'], + refreshonly => true, + } + # setup dnf-autoupdate include profiles::yum::autoupdater