From f1e3bef16f219b119be8df57916e532f6c527f89 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 1 Oct 2019 15:46:47 +0200 Subject: [PATCH] upload hosts towards ftp-master need read access to the bm dak replica --- data/nodes/coccia.debian.org.yaml | 1 + data/nodes/usper.debian.org.yaml | 1 + modules/roles/manifests/api_ftp_master.pp | 1 - modules/roles/manifests/queued_to_ftpmaster.pp | 7 +++++++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 modules/roles/manifests/queued_to_ftpmaster.pp diff --git a/data/nodes/coccia.debian.org.yaml b/data/nodes/coccia.debian.org.yaml index 17868edf8..905433531 100644 --- a/data/nodes/coccia.debian.org.yaml +++ b/data/nodes/coccia.debian.org.yaml @@ -3,4 +3,5 @@ classes: - roles::api_ftp_master - roles::ftp_upload - roles::ssh_upload + - roles::queued_to_ftpmaster - roles::static_source diff --git a/data/nodes/usper.debian.org.yaml b/data/nodes/usper.debian.org.yaml index 3883d9756..1dab4de68 100644 --- a/data/nodes/usper.debian.org.yaml +++ b/data/nodes/usper.debian.org.yaml @@ -2,3 +2,4 @@ classes: - roles::ftp_upload - roles::ssh_upload + - roles::queued_to_ftpmaster diff --git a/modules/roles/manifests/api_ftp_master.pp b/modules/roles/manifests/api_ftp_master.pp index c3031787d..61b9d3785 100644 --- a/modules/roles/manifests/api_ftp_master.pp +++ b/modules/roles/manifests/api_ftp_master.pp @@ -7,5 +7,4 @@ class roles::api_ftp_master { # is api_ftp_master the right role to put this in? include roles::udd::db_guest_access - include roles::postgresql::ftp_master_dak_replica::db_guest_access::bm } diff --git a/modules/roles/manifests/queued_to_ftpmaster.pp b/modules/roles/manifests/queued_to_ftpmaster.pp new file mode 100644 index 000000000..fb707981d --- /dev/null +++ b/modules/roles/manifests/queued_to_ftpmaster.pp @@ -0,0 +1,7 @@ +# ftp-master runs scripts that need access to the dak DB replica +# +# Hosts that run upload queues (ftp or ssh), for packages destined +# for ftp-master. +class roles::queued_to_ftpmaster { + include roles::postgresql::ftp_master_dak_replica::db_guest_access::bm +} -- 2.20.1