Add static_mirror_nopush concept

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 3e66dc9d8b4b4b6507a675f77398e8088ca50653..928e9d046646e8c3b429ea9b9346e0abe3ba18ef 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -91,6 +91,10 @@ roles:
     - busoni.debian.org
     - klecker.debian.org
     - senfter.debian.org
+    - mirror-csail.debian.org
+  # when adding a new static mirror, allow it to sync etc, but do not push to it and wait for it.  For this, also add it to static_mirror_nopush.
+  static_mirror_nopush:
+    - mirror-csail.debian.org
   static_source:
     - master.debian.org
     - dillon.debian.org

diff --git a/modules/roles/templates/static-mirroring/static-clients.conf.erb b/modules/roles/templates/static-mirroring/static-clients.conf.erb
index 8e2b872172a365cd968349af7cc7e1cebc267d40..33f9644a93afc9526bdcde8640616e1615b0a407 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-clients.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-clients.conf.erb
@@ -4,7 +4,10 @@
 
 <%=
 
-scope.lookupvar('site::roles')['static_mirror'].join("\n")
+# do not include mirrors in static_mirror_nopush
+static_mirror_nopush = scope.lookupvar('site::roles')['static_mirror_nopush']
+
+scope.lookupvar('site::roles')['static_mirror'].reject{ |x| static_mirror_nopush.include?(x) }.join("\n")
 
 # vim:set et:
 # vim:set sts=4 ts=4: