Mercurial > repos > other > Puppet
diff manifests/templates.pp @ 258:b173842cabbf
Update repo handling
* Make sure that repo keys are installed before repos using tags
* Re-add IBBoard repo for CentOS 8 - we now build mod_xsendfile
author | IBBoard <dev@ibboard.co.uk> |
---|---|
date | Sun, 22 Dec 2019 14:46:29 -0500 |
parents | 2d119b462c83 |
children | c3ecb1e58713 |
line wrap: on
line diff
--- a/manifests/templates.pp Sun Dec 22 14:43:29 2019 -0500 +++ b/manifests/templates.pp Sun Dec 22 14:46:29 2019 -0500 @@ -1,5 +1,5 @@ # Make sure packages come after their repos -YumRepo<| |> -> Package<| |> +File<| tag == 'repo-config' |> -> YumRepo<| |> -> Package<| |> # Make sure all files are in place before starting services File<| tag != 'post-service' |> -> Service<| |> @@ -209,21 +209,20 @@ } file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$osver": ensure => present, - source => "puppet:///common/RPM-GPG-KEY-EPEL-$osver" + source => "puppet:///common/RPM-GPG-KEY-EPEL-$osver", + tag => 'repo-config', } - if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '7') >= 0 and versioncmp($operatingsystemrelease, '8') < 0 { - # We only have extra packages for CentOS 7 - yumrepo { 'ibboard': - baseurl => 'https://download.opensuse.org/repositories/home:/IBBoard:/server/CentOS_$releasever/', - descr => 'Extra packages from IBBoard', - enabled => 1, - gpgcheck => 1, - gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard', - } - file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard': - ensure => present, - source => 'puppet:///common/RPM-GPG-KEY-ibboard' - } + yumrepo { 'ibboard': + baseurl => 'https://download.opensuse.org/repositories/home:/IBBoard:/server/CentOS_$releasever/', + descr => 'Extra packages from IBBoard', + enabled => 1, + gpgcheck => 1, + gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard', + } + file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard': + ensure => present, + source => 'puppet:///common/RPM-GPG-KEY-ibboard', + tag => 'repo-config', } yumrepo { 'webtatic': ensure => absent,