From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 20 Sep 2019 18:21:45 +0000 (+0200)
Subject: onionbalance -> hiera role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a6dec5b4a7f89cb14c6d50ab5febccc12a195004;p=mirror%2Fdsa-puppet.git

onionbalance -> hiera role
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e3afd7966..a8b6b1f57 100644
--- 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
index 000000000..902427639
--- /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 3a602becc..3088d1e5c 100644
--- 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
 	}