From d891d2ddc4c8447648be4efe3ad335e0ea5c492d Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 7 Sep 2019 20:06:43 +0200 Subject: [PATCH] make wuiet be buildd_master via a hiera class include --- hieradata/common.yaml | 2 -- hieradata/nodes/wuiet.debian.org.yaml | 2 ++ modules/roles/manifests/init.pp | 4 ---- modules/samhain/templates/samhainrc.erb | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 hieradata/nodes/wuiet.debian.org.yaml diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 12798e573..d62a933bd 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -28,8 +28,6 @@ roles: bugs_base: - buxtehude.debian.org - beach.debian.org - buildd_master: - - wuiet.debian.org contributors: - nono.debian.org dbmaster: diff --git a/hieradata/nodes/wuiet.debian.org.yaml b/hieradata/nodes/wuiet.debian.org.yaml new file mode 100644 index 000000000..e601295f7 --- /dev/null +++ b/hieradata/nodes/wuiet.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd_master diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 5dd829320..8c976f78e 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -196,10 +196,6 @@ class roles { include roles::tracker } - if has_role('buildd_master') { - include roles::buildd_master - } - if has_role('piuparts') { include roles::piuparts } diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 987a3a268..fc134cfe8 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -192,7 +192,7 @@ file=/etc/ssh/userkeys/staticsync <% if scope.function_has_role(['ssh.upload.d.o']) -%> file=/etc/ssh/userkeys/buildd-uploader <% end -%> -<% if scope.function_has_role(['buildd_master']) -%> +<% if classes.include?('roles::buildd_master') -%> file=/etc/ssh/userkeys/wb-buildd.more <% end -%> file=/etc/rsyncd -- 2.20.1