sreview, veyepar -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 5b57eba..5a199d5 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -222,10 +222,6 @@ roles:
     - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org
-  veyepar.debian.org:
-    - vittoria.debian.org
-  sreview.debian.org:
-    - vittoria.debian.org
   debian_mirror:
     klecker.debian.org:
       listen-addresses:

diff --git a/hieradata/nodes/vittoria.debian.org.yaml b/hieradata/nodes/vittoria.debian.org.yaml
new file mode 100644 (file)
index 0000000..98a6e4f
--- /dev/null
+++ b/hieradata/nodes/vittoria.debian.org.yaml
@@ -0,0 +1,3 @@
+classes:
+  - roles::sreview
+  - roles::veyepar

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index b6779a3..6f06d74 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -257,13 +257,6 @@ class roles {
                include roles::snapshot_shell
        }
 
-       if has_role('veyepar.debian.org') {
-               include roles::veyepar
-       }
-       if has_role('sreview.debian.org') {
-               include roles::sreview
-       }
-
        if has_role('debtags') {
                include roles::debtags
        }