From 552af07a8049ad4824fe7f49df25abe549c7fd0f Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lars@linux-schulserver.de>
Date: Feb 04 2020 11:35:26 +0000
Subject: Merge branch 'cboltz-cleanup-narwal' into 'production'


Delete old narwal VMs from pillar/id/

See merge request infra/salt!334
---

diff --git a/pillar/id/narwal2_infra_opensuse_org.sls b/pillar/id/narwal2_infra_opensuse_org.sls
deleted file mode 100644
index b29c56f..0000000
--- a/pillar/id/narwal2_infra_opensuse_org.sls
+++ /dev/null
@@ -1,17 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  hostusage:
-    - static.o.o
-  roles:
-    - web_static
-  reboot_safe: unknown
-  salt_cluster: opensuse
-  virt_cluster: atreju
-
-  aliases: []
-  description: Old static.o.o server, to be shut down - see https://progress.opensuse.org/issues/49910
-  documentation: []
-  responsible: []
-  partners: []
-  weburls: []
diff --git a/pillar/id/narwal3_infra_opensuse_org.sls b/pillar/id/narwal3_infra_opensuse_org.sls
deleted file mode 100644
index 582c674..0000000
--- a/pillar/id/narwal3_infra_opensuse_org.sls
+++ /dev/null
@@ -1,20 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  hostusage:
-    - html5test.o.o
-    - shop.o.o
-    - static.o.o
-    - studioexpress.o.o
-  roles:
-    - web_static
-  reboot_safe: unknown
-  salt_cluster: opensuse
-  virt_cluster: atreju
-
-  aliases: []
-  description: Old static.o.o server, to be shut down - see https://progress.opensuse.org/issues/49910
-  documentation: []
-  responsible: []
-  partners: []
-  weburls: []
diff --git a/pillar/id/narwal_infra_opensuse_org.sls b/pillar/id/narwal_infra_opensuse_org.sls
deleted file mode 100644
index b29c56f..0000000
--- a/pillar/id/narwal_infra_opensuse_org.sls
+++ /dev/null
@@ -1,17 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  hostusage:
-    - static.o.o
-  roles:
-    - web_static
-  reboot_safe: unknown
-  salt_cluster: opensuse
-  virt_cluster: atreju
-
-  aliases: []
-  description: Old static.o.o server, to be shut down - see https://progress.opensuse.org/issues/49910
-  documentation: []
-  responsible: []
-  partners: []
-  weburls: []