From fbd832fc154014b80f46e6862c54a2cb0c537b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20L=C3=B6nnemark?= <tobbez@ryara.net>
Date: Mon, 16 Jan 2023 21:36:08 +0100
Subject: [PATCH] Use ensure_packages to manage packages
Some package resources (e.g. gnupg) are also defined elsewhere.
---
manifests/deb_repository.pp | 8 +-------
manifests/yum_repository.pp | 4 ++--
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/manifests/deb_repository.pp b/manifests/deb_repository.pp
index d03e5cd..e173bd0 100644
--- a/manifests/deb_repository.pp
+++ b/manifests/deb_repository.pp
@@ -1,12 +1,6 @@
class repomaster::deb_repository
{
- package {
- [
- 'reprepro', 'nginx', 'gnupg',
- ]:
- ensure => installed,
- require => Class['network'];
- }
+ ensure_packages(['reprepro', 'nginx', 'gnupg'])
file { '/etc/motd':
ensure => file,
diff --git a/manifests/yum_repository.pp b/manifests/yum_repository.pp
index c1e8b8a..3bdbd46 100644
--- a/manifests/yum_repository.pp
+++ b/manifests/yum_repository.pp
@@ -5,7 +5,7 @@ class repomaster::yum_repository
'x86_64',
]
- package { 'createrepo-c': }
+ ensure_packages(['createrepo-c'])
# RHEL, CentOS, Rocky, etc.
repomaster::yum_repository::init_repos { 'enterprise linux':
@@ -32,7 +32,7 @@ class repomaster::yum_repository
}
# contains chronic, required by lysator_update_yum_repos_cron
- package { 'moreutils': }
+ ensure_packages(['moreutils'])
file { '/usr/local/bin/lysator_update_yum_repos_cron':
ensure => file,
--
GitLab