X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fplanet_master%2Fplanet-master.debian.org.erb;h=fc644c93262c6046b6153b8efec77f529db4c66d;hb=f79fdb6bb13b6eb8a0c8b0dcf117a2c3e0e241c6;hp=95afcf03d3ddf3675bbd78276492b0a8d21b2208;hpb=c93738739075e2bd2ebac4c3d4ac1be171634003;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/planet_master/planet-master.debian.org.erb b/modules/roles/templates/planet_master/planet-master.debian.org.erb
index 95afcf03d..fc644c932 100644
--- a/modules/roles/templates/planet_master/planet-master.debian.org.erb
+++ b/modules/roles/templates/planet_master/planet-master.debian.org.erb
@@ -25,12 +25,8 @@ Use common-debian-service-https-redirect * planet-master.debian.org
 		Require ip 127.0.0.1
 <%=
   lines = []
-  roles = scope.lookupvar('site::roles')
-  roles['planet_master'].each do |node|
-    lines << "\t\t# #{scope.lookupvar('site::allnodeinfo')[node]['hostname'][0]}"
-    scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |addr|
-      lines << "\t\tRequire ip #{addr}"
-    end
+  scope.lookupvar('base::public_addresses').each do |addr|
+    lines << "\t\tRequire ip #{addr}"
   end
   lines.join("\n")
 # vim:set et: