Move the backup of the pg instance on postgresql-manda-01 to a more hiera and facter...

diff --git a/data/common.yaml b/data/common.yaml
index eee0c6d..c4f5151 100644 (file)
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -82,7 +82,6 @@ roles:
     - danzi.debian.org
     - fasolo.debian.org
     - lw07.debian.org
-    - postgresql-manda-01.debian.org
     - sallinen.debian.org
     - seger.debian.org
     - snapshotdb-manda-01.debian.org

diff --git a/data/nodes/postgresql-manda-01.debian.org.yaml b/data/nodes/postgresql-manda-01.debian.org.yaml
new file mode 100644 (file)
index 0000000..b640495
--- /dev/null
+++ b/data/nodes/postgresql-manda-01.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::postgresql::server

diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index 97fccce..c46d3b2 100644 (file)
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -39,15 +39,7 @@ class postgres::backup_source {
     }
   }
 
-  if $::hostname in [postgresql-manda-01] {
-    postgres::backup_cluster { "${::hostname}-bacula":
-      pg_version => '11',
-      pg_port    => 5432,
-      pg_cluster => 'bacula',
-    }
-  }
-
-  if $::hostname in [godard, danzi, postgresql-manda-01] {
+  if $::hostname in [godard, danzi] {
     postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
     }
   }