From 13581ee3cf37c33606b8c8317c0901459e34c313 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 17:06:41 +0200
Subject: [PATCH] Revert "ssh_upload -> hiera role"

This reverts commit fe6c9108858446d5081a4d3505280bafe018cbdc.

This change is not a nop as expected.  Revert until we figure out why.
---
 hieradata/common.yaml                  | 4 ++++
 hieradata/nodes/coccia.debian.org.yaml | 1 -
 hieradata/nodes/suchon.debian.org.yaml | 3 ---
 hieradata/nodes/usper.debian.org.yaml  | 1 -
 modules/roles/manifests/init.pp        | 3 +++
 5 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 hieradata/nodes/suchon.debian.org.yaml

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index c63ec9a86..2e4b0e610 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -112,6 +112,10 @@ roles:
     - soriano.debian.org
   security_upload:
     - suchon.debian.org
+  ssh.upload.d.o:
+    - coccia.debian.org
+    - suchon.debian.org
+    - usper.debian.org
   sso:
     - diabelli.debian.org
   # single sign on relying party (host) - also required apache2 module enabled on that host via other means
diff --git a/hieradata/nodes/coccia.debian.org.yaml b/hieradata/nodes/coccia.debian.org.yaml
index 17868edf8..dfa719bd1 100644
--- a/hieradata/nodes/coccia.debian.org.yaml
+++ b/hieradata/nodes/coccia.debian.org.yaml
@@ -2,5 +2,4 @@
 classes:
   - roles::api_ftp_master
   - roles::ftp_upload
-  - roles::ssh_upload
   - roles::static_source
diff --git a/hieradata/nodes/suchon.debian.org.yaml b/hieradata/nodes/suchon.debian.org.yaml
deleted file mode 100644
index 49ef5b055..000000000
--- a/hieradata/nodes/suchon.debian.org.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-classes:
-  - roles::ssh_upload
diff --git a/hieradata/nodes/usper.debian.org.yaml b/hieradata/nodes/usper.debian.org.yaml
index 3883d9756..7d70f599f 100644
--- a/hieradata/nodes/usper.debian.org.yaml
+++ b/hieradata/nodes/usper.debian.org.yaml
@@ -1,4 +1,3 @@
 ---
 classes:
   - roles::ftp_upload
-  - roles::ssh_upload
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 83ddc6c30..f1e24a740 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,6 +34,9 @@ class roles {
 		include roles::dakmaster
 		include roles::signing
 	}
+	if has_role('ssh.upload.d.o') {
+		include roles::ssh_upload
+	}
 	if has_role('security_upload') {
 		include roles::security_upload
 	}
-- 
2.20.1