From f641505c4963380de55c77b18380ad166d66a6ed Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 11 Oct 2014 12:07:31 +0200 Subject: [PATCH] Add static_mirror_nopush concept --- hieradata/common.yaml | 4 ++++ .../roles/templates/static-mirroring/static-clients.conf.erb | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 3e66dc9d..928e9d04 100644 --- 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 8e2b8721..33f9644a 100644 --- 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: -- 2.39.2