From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 10:47:52 +0000 (+0200)
Subject: ports_master -> hiera role
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=17942a3ff54d939a9cf1d2f3761fe22bb6251ea1

ports_master -> hiera role
---

diff --git a/data/common.yaml b/data/common.yaml
index 5e3a009b3..1efdd7630 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -148,9 +148,6 @@ roles:
   debug_mirror_onion:
     - mirror-accumu.debian.org
     - schmelzer.debian.org
-  ports_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - porta.debian.org
   bgp:
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
diff --git a/data/nodes/porta.debian.org.yaml b/data/nodes/porta.debian.org.yaml
index f044c0359..d32568449 100644
--- a/data/nodes/porta.debian.org.yaml
+++ b/data/nodes/porta.debian.org.yaml
@@ -1,3 +1,5 @@
+---
 classes:
+  - roles::ports_master
   - roles::static_master
   - roles::static_source
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index de570296d..adc2795ad 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -42,10 +42,6 @@ class roles {
 		include roles::snapshot
 	}
 
-	if has_role('ports_master') {
-		include roles::ports_master
-	}
-
 	if has_role('bgp') {
 		include roles::bgp
 	}