onionbalance -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e3afd79..a8b6b1f 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -176,8 +176,6 @@ roles:
   ports_master:
     # XXX - used by ferm templates/defs.conf.erb
     - porta.debian.org
-  onionbalance:
-    - olin.debian.org
   bgp:
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3a602be..3088d1e 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -61,9 +61,6 @@ class roles {
                include roles::ports_master
        }
 
-       if has_role('onionbalance') {
-               include onion::balance
-       }
        if has_role('bgp') {
                include roles::bgp
        }