From 5260e1af433f0df0564250252d9db7dff963cda0 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lars@linux-schulserver.de>
Date: Feb 04 2020 14:10:49 +0000
Subject: Merge branch 'lrupp/osc-collab-admins' into 'production'


fix hostusage for osc-collab machines

See merge request infra/salt!342
---

diff --git a/pillar/id/osc-collab2_infra_opensuse_org.sls b/pillar/id/osc-collab2_infra_opensuse_org.sls
index f53bf1c..de037e3 100644
--- a/pillar/id/osc-collab2_infra_opensuse_org.sls
+++ b/pillar/id/osc-collab2_infra_opensuse_org.sls
@@ -1,7 +1,8 @@
 grains:
   city: nuremberg
   country: de
-  hostusage: osc-collab
+  hostusage: 
+    - osc-collab
   roles:
     - osc-collab
   reboot_safe: yes
diff --git a/pillar/id/osc-collab_infra_opensuse_org.sls b/pillar/id/osc-collab_infra_opensuse_org.sls
index bc02cda..01fbc4d 100644
--- a/pillar/id/osc-collab_infra_opensuse_org.sls
+++ b/pillar/id/osc-collab_infra_opensuse_org.sls
@@ -1,9 +1,10 @@
 grains:
   city: nuremberg
   country: de
-  hostusage: osc-collab
+  hostusage: 
+    - osc-collab
   roles: []
-  reboot_safe: unknown
+  reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju