bugs_mirror -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f75b609..d492a78 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -37,8 +37,6 @@ roles:
     - buxtehude.debian.org
   bugs_master:
     - buxtehude.debian.org
-  bugs_mirror:
-    - beach.debian.org
   bugs_base:
     - buxtehude.debian.org
     - beach.debian.org

diff --git a/hieradata/nodes/beach.debian.org.yaml b/hieradata/nodes/beach.debian.org.yaml
new file mode 100644 (file)
index 0000000..a202ad6
--- /dev/null
+++ b/hieradata/nodes/beach.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - bugs_mirror

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 8130551..57ada6b 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,10 +15,6 @@ class roles {
                include nagios::server
        }
 
-       if has_role('bugs_mirror') {
-               include roles::bugs_mirror
-       }
-
        if has_role('bugs_base') {
                ssl::service { 'bugs.debian.org':
                        notify  => Exec['service apache2 reload'],