ports_master -> hiera role

diff --git a/data/common.yaml b/data/common.yaml
index 5e3a009..1efdd76 100644 (file)
--- 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 f044c03..d325684 100644 (file)
--- 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 de57029..adc2795 100644 (file)
--- 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
        }