From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 28 Sep 2019 18:30:27 +0000 (+0200)
Subject: Move backup role name to hiera
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=bba8ee80cda9bd8ecc419330f632e7d8df7df300

Move backup role name to hiera
---

diff --git a/data/common.yaml b/data/common.yaml
index 3e45e0978..a4f5e826b 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -30,6 +30,7 @@ roles::dns_primary::allow_access:
   - '194.146.105.25'
   - '2a01:3f0:0:27::24'
   - '2a01:3f0:0:28::25'
+postgres::backup_cluster::db_backup_role: debian-backup
 # bacula
 #
 bacula::email_all: 'bacula-reports@admin.debian.org'
diff --git a/modules/postgres/manifests/backup_cluster.pp b/modules/postgres/manifests/backup_cluster.pp
index 10a43464b..bb61e9356 100644
--- a/modules/postgres/manifests/backup_cluster.pp
+++ b/modules/postgres/manifests/backup_cluster.pp
@@ -1,9 +1,9 @@
 #
 define postgres::backup_cluster(
   String $pg_version,
+  String $db_backup_role,
   String $pg_cluster = 'main',
   Integer $pg_port = 5432,
-  String $db_backup_role = 'debian-backup',
   String $db_backup_role_password = hkdf('/etc/puppet/secret', "postgresql-${::hostname}-${$pg_cluster}-${pg_port}-backup_role}"),
   Boolean $do_role = false,
   Boolean $do_hba = false,