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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index dfa390276..d15c91d9a 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -36,7 +36,6 @@ roles:
     - fasolo.debian.org
   ftp.upload.d.o:
     - coccia.debian.org
-    - suchon.debian.org
     - usper.debian.org
   api.ftp-master:
     - coccia.debian.org
@@ -52,13 +51,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 +129,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 +270,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
@@ -294,7 +287,6 @@ roles:
     - sechter.debian.org
     - setoguchi.debian.org
     - ticharich.debian.org
-    - villa.debian.org
   bgp:
     - mirror-bytemark.debian.org
     - mirror-conova.debian.org
@@ -308,6 +300,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 +309,7 @@ roles:
     - seger.debian.org
     - sibelius.debian.org
     - vittoria.debian.org
+  salsa.debian.org:
+    - godard.debian.org
+  insecure_ssl:
+    - godard.debian.org