From f2c0ff27cd31263a2ccce2eaac2791ba645f8d69 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 28 Sep 2019 18:26:43 +0200 Subject: [PATCH] Class instance names need to encode version and clustername, not just hostname, to work on hosts with more than one cluster --- modules/roles/manifests/postgresql/server.pp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/roles/manifests/postgresql/server.pp b/modules/roles/manifests/postgresql/server.pp index 20c4c6cfc..785bc0936 100644 --- a/modules/roles/manifests/postgresql/server.pp +++ b/modules/roles/manifests/postgresql/server.pp @@ -8,11 +8,14 @@ class roles::postgresql::server { $clusters.each |$cluster| { # Do not backup clusters that are replication targets, # like the dak mirror or snapshot secondaries + $version = $cluster['version'] + $cluster_name = $cluster['cluster'] + $port = $cluster['port'] if ! $cluster['status']['recovery'] { - postgres::backup_cluster { $::hostname: - pg_version => $cluster['version'], - pg_cluster => $cluster['cluster'], - pg_port => $cluster['port'], + postgres::backup_cluster { "${::hostname}-${version}-${cluster_name}": + pg_version => $version, + pg_cluster => $cluster_name, + pg_port => $port, } } } -- 2.20.1