From 87b95e842653f37fa184d33b34e9489e6940084a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Fri, 22 Apr 2022 18:09:41 +0200
Subject: [PATCH] Change all package declarations to ensure_packages.
Package must be exclusive, while ensure_package can occur in other
places.
---
manifests/base/centos.pp | 14 ++++++------
manifests/base/common.pp | 46 ++++++++++++++++++++--------------------
manifests/base/redhat.pp | 14 ++++++------
manifests/base/rocky.pp | 14 ++++++------
4 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/manifests/base/centos.pp b/manifests/base/centos.pp
index 8c4c4c7..cc03463 100644
--- a/manifests/base/centos.pp
+++ b/manifests/base/centos.pp
@@ -1,9 +1,9 @@
class packages::base::centos {
- package { [
- 'redhat-lsb',
- 'bind-utils',
- 'vim-enhanced',
- ]:
- ensure => installed,
- }
+ ensure_packages ([
+ 'redhat-lsb',
+ 'bind-utils',
+ 'vim-enhanced',
+ ], {
+ ensure => installed,
+ })
}
diff --git a/manifests/base/common.pp b/manifests/base/common.pp
index 7277ca8..03b61b3 100644
--- a/manifests/base/common.pp
+++ b/manifests/base/common.pp
@@ -1,25 +1,25 @@
class packages::base::common {
- package { [
- 'bash-completion',
- 'fping',
- 'git',
- 'htop',
- 'iftop',
- 'iotop',
- 'lshw',
- 'lsof',
- 'pciutils',
- 'rsync',
- 'screen',
- 'strace',
- 'sysstat',
- 'tcsh',
- 'tmux',
- 'traceroute',
- 'usbutils',
- 'wget',
- 'zsh',
- ]:
- ensure => installed,
- }
+ ensure_packages([
+ 'bash-completion',
+ 'fping',
+ 'git',
+ 'htop',
+ 'iftop',
+ 'iotop',
+ 'lshw',
+ 'lsof',
+ 'pciutils',
+ 'rsync',
+ 'screen',
+ 'strace',
+ 'sysstat',
+ 'tcsh',
+ 'tmux',
+ 'traceroute',
+ 'usbutils',
+ 'wget',
+ 'zsh',
+ ], {
+ ensure => installed,
+ })
}
diff --git a/manifests/base/redhat.pp b/manifests/base/redhat.pp
index a0525a4..f7eab60 100644
--- a/manifests/base/redhat.pp
+++ b/manifests/base/redhat.pp
@@ -1,9 +1,9 @@
class packages::base::redhat {
- package { [
- 'redhat-lsb',
- 'bind-utils',
- 'vim-enhanced',
- ]:
- ensure => installed,
- }
+ ensure_packages ([
+ 'redhat-lsb',
+ 'bind-utils',
+ 'vim-enhanced',
+ ], {
+ ensure => installed,
+ })
}
diff --git a/manifests/base/rocky.pp b/manifests/base/rocky.pp
index c7ec9be..b3e4248 100644
--- a/manifests/base/rocky.pp
+++ b/manifests/base/rocky.pp
@@ -1,9 +1,9 @@
class packages::base::rocky {
- package { [
- 'redhat-lsb',
- 'bind-utils',
- 'vim-enhanced',
- ]:
- ensure => installed,
- }
+ ensure_packages([
+ 'redhat-lsb',
+ 'bind-utils',
+ 'vim-enhanced',
+ ], {
+ ensure => installed,
+ })
}
--
GitLab