From e045dcb705c4e95764666d2ec7348042ebf060b3 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Mar 12 2019 16:00:32 +0000
Subject: Merge branch 'events_moved' into 'production'


remove conference.i.o.o, events.o.o moved to dale.i.o.o

See merge request infra/salt!225
---

diff --git a/pillar/id/conference_infra_opensuse_org.sls b/pillar/id/conference_infra_opensuse_org.sls
deleted file mode 100644
index e0322cd..0000000
--- a/pillar/id/conference_infra_opensuse_org.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  hostusage:
-    - events.o.o
-  salt_cluster: opensuse
-  virt_cluster: atreju
diff --git a/pillar/id/dale_infra_opensuse_org.sls b/pillar/id/dale_infra_opensuse_org.sls
index 621413e..d5b2a57 100644
--- a/pillar/id/dale_infra_opensuse_org.sls
+++ b/pillar/id/dale_infra_opensuse_org.sls
@@ -2,7 +2,7 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - future events.o.o replacement
+    - events.o.o
   roles:
     - web_osem
   salt_cluster: opensuse