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

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

diff --git a/data/common.yaml b/data/common.yaml
index e1e78c8b1..eee0c6dea 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -86,7 +86,6 @@ roles:
     - sallinen.debian.org
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
-    - vittoria.debian.org
 
 classes:
   - base::includes
diff --git a/data/nodes/vittoria.debian.org.yaml b/data/nodes/vittoria.debian.org.yaml
index 98a6e4f93..8c3f8a6a4 100644
--- a/data/nodes/vittoria.debian.org.yaml
+++ b/data/nodes/vittoria.debian.org.yaml
@@ -1,3 +1,5 @@
+---
 classes:
+  - roles::postgresql::server
   - roles::sreview
   - roles::veyepar
diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index 663a6b490..b11d634f1 100644
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -17,11 +17,6 @@ class postgres::backup_source {
   ssh::keygen {'postgres': }
 
 
-  if $::hostname in [vittoria] {
-    postgres::backup_cluster { $::hostname:
-      pg_version => '9.6',
-    }
-  }
   if $::hostname in [buxtehude] {
     postgres::backup_cluster { $::hostname:
       pg_version => '11',
@@ -63,7 +58,7 @@ class postgres::backup_source {
     }
   }
 
-  if $::hostname in [vittoria, godard, buxtehude, danzi, postgresql-manda-01] {
+  if $::hostname in [godard, buxtehude, danzi, postgresql-manda-01] {
     postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
     }
   }