From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 28 Sep 2019 09:31:57 +0000 (+0200)
Subject: Drop HOST_PGBACKUPHOST_V4 and HOST_PGBACKUPHOST_V6
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=0da1af36e2aa3aafc65e54135c7ec36da7acff91

Drop HOST_PGBACKUPHOST_V4 and HOST_PGBACKUPHOST_V6
---

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 84aa85de1..926584941 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -41,9 +41,7 @@
   dbs.flatten!
 %>
 
-@def $HOST_PGBACKUPHOST_V4 = (<%= scope.function_filter_ipv4([rolehost['postgres_backup_server']]).uniq.join(' ') %>);
-@def $HOST_PGBACKUPHOST_V6 = (<%= scope.function_filter_ipv6([rolehost['postgres_backup_server']]).uniq.join(' ') %>);
-@def $HOST_PGBACKUPHOST = ( $HOST_PGBACKUPHOST_V4 $HOST_PGBACKUPHOST_V6 );
+@def $HOST_PGBACKUPHOST = (<%= rolehost['postgres_backup_server'].uniq.join(' ') %>);
 
 
 <%