From b6b5875ecc9c3e110001467f5855b091806f0592 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Aug 09 2020 21:03:23 +0000
Subject: Merge branch 'hellcp/pillar' into 'production'


Update the pillar ids after tsp changes

See merge request infra/salt!436
---

diff --git a/pillar/id/boosters_infra_opensuse_org.sls b/pillar/id/boosters_infra_opensuse_org.sls
index 6f6a1f4..98f712b 100644
--- a/pillar/id/boosters_infra_opensuse_org.sls
+++ b/pillar/id/boosters_infra_opensuse_org.sls
@@ -8,7 +8,7 @@ grains:
   virt_cluster: atreju
 
   aliases: []
-  description: connect.opensuse.org platform, travel support
+  description: connect.opensuse.org platform
   documentation: []
   responsible: []
   partners: []
diff --git a/pillar/id/matrix_infra_opensuse_org.sls b/pillar/id/matrix_infra_opensuse_org.sls
index 45915cd..9a01ac2 100644
--- a/pillar/id/matrix_infra_opensuse_org.sls
+++ b/pillar/id/matrix_infra_opensuse_org.sls
@@ -16,3 +16,8 @@ grains:
   responsible:
     - hellcp
   partners: []
+  weburls:
+    - https://matrix.opensuse.org/
+    - https://chat.opensuse.org/
+    - https://webhook.opensuse.org/
+    - https://dimension.opensuse.org/
diff --git a/pillar/id/tsp_infra_opensuse_org.sls b/pillar/id/tsp_infra_opensuse_org.sls
index 141bf9f..5316657 100644
--- a/pillar/id/tsp_infra_opensuse_org.sls
+++ b/pillar/id/tsp_infra_opensuse_org.sls
@@ -2,7 +2,7 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - future travel support program webapp replacement
+    - Travel Support Program webapp
   roles:
     - web_tsp
   reboot_safe: unknown
@@ -10,10 +10,12 @@ grains:
   virt_cluster: atreju
 
   aliases: []
-  description: future travel support program webapp server
+  description: Travel Support Program (tsp) webapp server
   documentation: []
   responsible:
     - ancorgs
     # IGonzalezSosa (no heroes account yet)
+    - hellcp
   partners: []
-  weburls: []
+  weburls: 
+    - https://tsp.opensuse.org