From fa4db2e0e2bfdbe7f099820917fbb28192d155a0 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Jul 21 2017 15:28:00 +0000
Subject: add/remove machines based on last week's split


---

diff --git a/pillar/id/anna_infra_opensuse_org.sls b/pillar/id/anna_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/anna_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/ariel_infra_opensuse_org.sls b/pillar/id/ariel_infra_opensuse_org.sls
deleted file mode 100644
index c9be0ec..0000000
--- a/pillar/id/ariel_infra_opensuse_org.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  roles:
-    - openqa
-  salt_cluster: opensuse
-  virt_cluster: atreju
diff --git a/pillar/id/disquss_infra_opensuse_org.sls b/pillar/id/disquss_infra_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/disquss_infra_opensuse_org.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  salt_cluster: opensuse
-  virt_cluster: atreju
diff --git a/pillar/id/elsa_infra_opensuse_org.sls b/pillar/id/elsa_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/elsa_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/scar_infra_opensuse_org.sls b/pillar/id/scar_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/scar_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/role/openqa.sls b/pillar/role/openqa.sls
deleted file mode 100644
index 5ef3e25..0000000
--- a/pillar/role/openqa.sls
+++ /dev/null
@@ -1,6 +0,0 @@
-sudoers:
-  included_files:
-    /etc/sudoers.d/openqa_trusted_group_nopasswd:
-      groups:
-        trusted:
-          - 'ALL=(ALL) NOPASSWD: ALL'
diff --git a/salt/role/openqa.sls b/salt/role/openqa.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/openqa.sls
+++ /dev/null
@@ -1 +0,0 @@
-#