Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / static-clients.conf.erb

diff --git a/modules/roles/templates/static-mirroring/static-clients.conf.erb b/modules/roles/templates/static-mirroring/static-clients.conf.erb
index edbf313..6d2cd5b 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-clients.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-clients.conf.erb
@@ -4,15 +4,11 @@
 
 <%=
 
-mirrors = []
-scope.lookupvar('site::localinfo').keys.sort.each do |node|
-    if scope.lookupvar('site::localinfo')[node]['static_mirror']
-        mirrors << node
-    end
-end
+# do not include mirrors in static_mirror_nopush
+static_mirror_nopush = scope.lookupvar('deprecated::roles')['static_mirror_nopush']
 
+scope.lookupvar('deprecated::roles')['static_mirror'].reject{ |x| static_mirror_nopush.include?(x) }.join("\n")
 
-mirrors.join("\n")
 # vim:set et:
 # vim:set sts=4 ts=4:
 # vim:set shiftwidth=4: