From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 4 Sep 2019 12:49:15 +0000 (+0200)
Subject: consolidate and expand ensure_packages on backup server
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d1558908fcc0911033fcc402735a9331e5c9e6fe;p=mirror%2Fdsa-puppet.git

consolidate and expand ensure_packages on backup server
---

diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp
index 11eae6af3..3042a5f93 100644
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -2,11 +2,20 @@
 class postgres::backup_server {
   include postgres::backup_server::globals
 
+  ensure_packages ( [
+    'libhash-merge-simple-perl',
+    'libyaml-perl',
+    'python-yaml',
+    'pigz',
+    'postgresql-client',
+    'postgresql-client-9.6',
+  ], {
+    ensure => 'installed'
+  })
+
   ####
   # Regularly pull base backups
   #
-  ensure_packages ( "postgresql-client-9.6", { ensure => 'installed' })
-
   concat { $postgres::backup_server::globals::make_base_backups:
     mode => '0555',
   }
@@ -90,7 +99,6 @@ class postgres::backup_server {
     notify => Exec['update dsa-check-backuppg-manual.conf']
   }
   File<<| tag == $postgres::backup_server::globals::tag_dsa_check_backupp |>>
-  ensure_packages ( "libhash-merge-simple-perl", { ensure => 'installed' })
   exec { "update dsa-check-backuppg-manual.conf":
     command  => @(EOF),
         perl -MYAML=LoadFile,Dump -MHash::Merge::Simple=merge -E 'say Dump(merge(map{LoadFile($_)}@ARGV))' /etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/*.conf > /etc/nagios/dsa-check-backuppg.conf