better instance names for pg clusters

[mirror/dsa-puppet.git] / modules / roles / manifests / postgresql / server.pp

diff --git a/modules/roles/manifests/postgresql/server.pp b/modules/roles/manifests/postgresql/server.pp
index 20c4c6c..99a8237 100644 (file)
--- a/modules/roles/manifests/postgresql/server.pp
+++ b/modules/roles/manifests/postgresql/server.pp
@@ -1,22 +1,20 @@
 #
 # postgresql server role
 #
-class roles::postgresql::server {
-  include postgres::backup_source
-
+# @param manage_clusters_hba manage clusters' pg_hba.conf using postgres::cluster.  Eventually should should be true for every host and we can drop the param
+class roles::postgresql::server(
+  Boolean $manage_clusters_hba = false,
+) {
   $clusters = $facts['postgresql_clusters']
   $clusters.each |$cluster| {
-    # Do not backup clusters that are replication targets,
-    # like the dak mirror or snapshot secondaries
-    if ! $cluster['status']['recovery'] {
-      postgres::backup_cluster { $::hostname:
-        pg_version => $cluster['version'],
-        pg_cluster => $cluster['cluster'],
-        pg_port    => $cluster['port'],
-      }
+    $version      = $cluster['version']
+    $cluster_name = $cluster['cluster']
+    $port         = $cluster['port']
+    postgres::cluster { "${version}::${cluster_name}":
+      pg_version => $version,
+      pg_cluster => $cluster_name,
+      pg_port    => $port,
+      manage_hba => $manage_clusters_hba,
     }
   }
-
-  postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
-  }
 }