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

ftp_master -> hiera role
---

diff --git a/data/common.yaml b/data/common.yaml
index 327884e55..5e3a009b3 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -54,9 +54,6 @@ apt::sources::debian::location: 'https://deb.debian.org/debian/'
 # all of these should be retired in favour of including the class role
 # with the host. weasel, 2019-09
 roles:
-  ftp_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - fasolo.debian.org
   muninmaster:
     # XXX - used by ferm templates/defs.conf.erb
     - menotti.debian.org
diff --git a/data/nodes/fasolo.debian.org.yaml b/data/nodes/fasolo.debian.org.yaml
index 73516ddba..3823fad7d 100644
--- a/data/nodes/fasolo.debian.org.yaml
+++ b/data/nodes/fasolo.debian.org.yaml
@@ -1,4 +1,6 @@
+---
 classes:
   - profile::ipsec::fasolo_storace
+  - roles::ftp_master
   - roles::static_master
   - roles::static_source
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4f10b9212..de570296d 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -29,9 +29,6 @@ class roles {
 	if has_role('debian_mirror') {
 		include roles::debian_mirror
 	}
-	if has_role('ftp_master') {
-		include roles::ftp_master
-	}
 
 	if has_role('security_mirror') {
 		include roles::security_mirror