ftp_master -> hiera role

diff --git a/data/common.yaml b/data/common.yaml
index 327884e..5e3a009 100644 (file)
--- 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 73516dd..3823fad 100644 (file)
--- 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 4f10b92..de57029 100644 (file)
--- 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