From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 14 Sep 2019 21:34:18 +0000 (+0200)
Subject: sreview, veyepar -> hiera role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8bc0bc85e4bcf39fadda0bec1e369fdfce12e53c;p=mirror%2Fdsa-puppet.git

sreview, veyepar -> hiera role
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 5b57eba33..5a199d53b 100644
--- 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
index 000000000..98a6e4f93
--- /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 b6779a3ac..6f06d746d 100644
--- 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
 	}