From 39734b0b30716ef3b84cfb5ff4d2f0cc6ee2997b Mon Sep 17 00:00:00 2001
From: Karol Babioch <kbabioch@suse.de>
Date: Sep 30 2019 18:22:13 +0000
Subject: Move the GitLab runner from simba.i.o.o to mickey.i.o.o


This is a cherry-picked / updated commit, based on !215 originally
proposed by @tampakrap. It was on hold for a long time, and I've updated
it, so it cleanly applies to current `production`.

Once this is deployed, we can finally get rid of `simba.i.o.o` to safe
on ressources.

---

diff --git a/pillar/id/mickey_infra_opensuse_org.sls b/pillar/id/mickey_infra_opensuse_org.sls
index a2e7135..db2e9eb 100644
--- a/pillar/id/mickey_infra_opensuse_org.sls
+++ b/pillar/id/mickey_infra_opensuse_org.sls
@@ -3,8 +3,10 @@ grains:
   country: de
   hostusage:
     - gitlab.i.o.o
+    - gitlab runner
   roles:
     - web_gitlab
+    - worker_gitlab
   reboot_safe: unknown
   salt_cluster: opensuse
   virt_cluster: atreju
diff --git a/pillar/id/simba_infra_opensuse_org.sls b/pillar/id/simba_infra_opensuse_org.sls
deleted file mode 100644
index 3e5cd9d..0000000
--- a/pillar/id/simba_infra_opensuse_org.sls
+++ /dev/null
@@ -1,10 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  hostusage:
-    - gitlab runner
-  roles:
-    - worker_gitlab
-  reboot_safe: unknown
-  salt_cluster: opensuse
-  virt_cluster: atreju