From c48a05d86204019345c08281dc01e06bf0b0ac6c Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 18 2020 16:58:14 +0000
Subject: new progress.i.o.o server is active now


- for progress.i.o.o, s/future// and add progress.o.o and tickets.o.o weburls
- remove weburls from old redmine.i.o.o and mark the VM as to be shut down

Note: admin.o.o does not exist in DNS, therefore drop it from weburls

---

diff --git a/pillar/id/progress_infra_opensuse_org.sls b/pillar/id/progress_infra_opensuse_org.sls
index 9f5df51..55ef578 100644
--- a/pillar/id/progress_infra_opensuse_org.sls
+++ b/pillar/id/progress_infra_opensuse_org.sls
@@ -2,16 +2,21 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - future progress.o.o replacement
+    - progress.o.o
+  roles: []
+# currently progress.i.o.o has a hand-written nginx config that differs from the config in the web_progress role
+#   - web_progress
   reboot_safe: unknown
   salt_cluster: opensuse
   virt_cluster: atreju
 
   aliases: []
-  description: future Redmine (progress.o.o) replacement
+  description: Redmine (progress.o.o) server
   documentation: []
   responsible:
     - tuanpembual
   partners: []
   weburls:
+    - https://progress.opensuse.org
     - https://progress-test.opensuse.org
+    - https://tickets.opensuse.org
diff --git a/pillar/id/redmine_infra_opensuse_org.sls b/pillar/id/redmine_infra_opensuse_org.sls
index 52a19ff..c105b78 100644
--- a/pillar/id/redmine_infra_opensuse_org.sls
+++ b/pillar/id/redmine_infra_opensuse_org.sls
@@ -10,11 +10,8 @@ grains:
   virt_cluster: atreju
 
   aliases: []
-  description: redmine (progress.o.o) server
+  description: old redmine (progress.o.o) server - to be shut down
   documentation: []
   responsible: []
   partners: []
-  weburls:
-    - https://admin.opensuse.org
-    - https://progress.opensuse.org
-    - https://tickets.opensuse.org
+  weburls: []