From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 28 Sep 2019 16:29:42 +0000 (+0200)
Subject: Move the backup of the pg instance on danzi to a more hiera and facter based setup
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=dc2f2881975e80ae6367e68e3acd750390691704

Move the backup of the pg instance on danzi to a more hiera and facter based setup
---

diff --git a/data/common.yaml b/data/common.yaml
index c4f515131..c7a8247e3 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -79,7 +79,6 @@ roles:
     # postgresql instances not managed by puppet otherwise
     - bmdb1.debian.org
     - buxtehude.debian.org
-    - danzi.debian.org
     - fasolo.debian.org
     - lw07.debian.org
     - sallinen.debian.org
diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index c46d3b20e..3b1e058fb 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -17,29 +17,7 @@ class postgres::backup_source {
   ssh::keygen {'postgres': }
 
 
-  if $::hostname in [danzi] {
-    postgres::backup_cluster { $::hostname:
-      pg_version => '9.6',
-      pg_port    => 5433,
-    }
-    postgres::backup_cluster { "${::hostname}-tracker":
-      pg_version => '9.6',
-      pg_port    => 5432,
-      pg_cluster => 'tracker',
-    }
-    postgres::backup_cluster { "${::hostname}-debconf":
-      pg_version => '9.6',
-      pg_port    => 5434,
-      pg_cluster => 'debconf',
-    }
-    postgres::backup_cluster { "${::hostname}-wannabuild":
-      pg_version => '9.6',
-      pg_port    => 5436,
-      pg_cluster => 'wannabuild',
-    }
-  }
-
-  if $::hostname in [godard, danzi] {
+  if $::hostname in [godard] {
     postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
     }
   }