debconf_wafer -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index fb057a5..ec348c4 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -288,8 +288,6 @@ roles:
     - vittoria.debian.org
   debsources:
     - sor.debian.org
-  debconf_wafer:
-    - debussy.debian.org
   apache_ratelimited:
     - beach.debian.org
     - buxtehude.debian.org

diff --git a/hieradata/nodes/debussy.debian.org.yaml b/hieradata/nodes/debussy.debian.org.yaml
index c9756e7..fa42ede 100644 (file)
--- a/hieradata/nodes/debussy.debian.org.yaml
+++ b/hieradata/nodes/debussy.debian.org.yaml
@@ -1 +1,5 @@
+---
+classes:
+  - roles::debconf_wafer
+
 ssl::insecure_ssl: true

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 6b9af9b..8ce734b 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -288,8 +288,4 @@ class roles {
        if has_role('debsources') {
                include roles::debsources
        }
-
-       if has_role('debconf_wafer') {
-               include roles::debconf_wafer
-       }
 }