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 e1e78c8..eee0c6d 100644 (file)
--- 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 98a6e4f..8c3f8a6 100644 (file)
--- 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 663a6b4..b11d634 100644 (file)
--- 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}}":
     }
   }