make wuiet be buildd_master via a hiera class include

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 12798e5..d62a933 100644 (file)
--- 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 (file)
index 0000000..e601295
--- /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 5dd8293..8c976f7 100644 (file)
--- 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 987a3a2..fc134cf 100644 (file)
--- 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