X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=348d08b9aea02b1dcfcbd1a601a7f432c17908f4;hb=60761867cccbfa7f472fb13fdd2d704d4cb32b92;hp=926584941c97b9e1aaf34874193b09be0df64cdd;hpb=0da1af36e2aa3aafc65e54135c7ec36da7acff91;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 926584941..348d08b9a 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -20,19 +20,7 @@
 }
 
 <%
-  rolehost={}
   allnodeinfo = scope.lookupvar('deprecated::allnodeinfo')
-  roles = scope.lookupvar('deprecated::roles')
-
-  %w{postgres_backup_server}.each do |role|
-    rolehost[role] = []
-    roles[role].each do |node|
-        next unless allnodeinfo.has_key?(node) and allnodeinfo[node].has_key?('ipHostNumber')
-        rolehost[role] << allnodeinfo[node]['ipHostNumber']
-    end
-    rolehost[role].flatten!.sort.uniq
-  end
-
   dbs = []
   allnodeinfo.keys.sort.each do |node|
       next unless allnodeinfo[node].has_key?('ipHostNumber')
@@ -41,9 +29,6 @@
   dbs.flatten!
 %>
 
-@def $HOST_PGBACKUPHOST = (<%= rolehost['postgres_backup_server'].uniq.join(' ') %>);
-
-
 <%
 def getfastlyranges()
     begin