X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=hieradata%2Fcommon.yaml;h=0e72f93c6df93bd60a8aa24675510223ffc99af0;hb=acafab70dc47db33070f0c8c1306eee0841339c9;hp=dfa390276641cd43b13249ab419b0ad386940014;hpb=888face5cb986811ac1b74e1ce81555670bc32a3;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index dfa390276..0e72f93c6 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -52,13 +52,8 @@ roles:
     - jerea.debian.org
   keyring:
     - kaufmann.debian.org
-  keystone_rabbitmq:
-    - rainier.debian.org
-    - rapoport.debian.org
   lists:
     - bendel.debian.org
-  list_search:
-    - stockhausen.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
@@ -135,6 +130,8 @@ roles:
     - mirror-bytemark.debian.org
   security_tracker:
     - soriano.debian.org
+  security_upload:
+    - suchon.debian.org
   ssh.upload.d.o:
     - coccia.debian.org
     - suchon.debian.org
@@ -274,13 +271,10 @@ roles:
   onionbalance:
     - olin.debian.org
   experimental_apache:
-    - beach.debian.org
     - cgi-grnet-01.debian.org
     - coccia.debian.org
-    - draghi.debian.org
     - klecker.debian.org
     - manziarly.debian.org
-    - milanollo.debian.org
     - mirror-bytemark.debian.org
     - mirror-csail.debian.org
     - mirror-isc.debian.org
@@ -308,6 +302,7 @@ roles:
     - tchaikovsky.debian.org
     - wuiet.debian.org
   postgresql_server:
+    # postgresql instances not managed by puppet otherwise
     - bmdb1.debian.org
     - buxtehude.debian.org
     - danzi.debian.org
@@ -316,3 +311,5 @@ roles:
     - seger.debian.org
     - sibelius.debian.org
     - vittoria.debian.org
+  salsa.debian.org:
+    - godard.debian.org