From 6c69f40b55bbd6077bb66253b768c65c68bedcf9 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: May 11 2017 14:37:02 +0000
Subject: Move the internal opensuse.org domain to infra.opensuse.org


---

diff --git a/pillar/domain/infra_opensuse_org.sls b/pillar/domain/infra_opensuse_org.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/domain/infra_opensuse_org.sls
@@ -0,0 +1 @@
+#
diff --git a/pillar/domain/opensuse_org.sls b/pillar/domain/opensuse_org.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/domain/opensuse_org.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/id/ariel_infra_opensuse_org.sls b/pillar/id/ariel_infra_opensuse_org.sls
new file mode 100644
index 0000000..c9be0ec
--- /dev/null
+++ b/pillar/id/ariel_infra_opensuse_org.sls
@@ -0,0 +1,7 @@
+grains:
+  city: nuremberg
+  country: de
+  roles:
+    - openqa
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/ariel_opensuse_org.sls b/pillar/id/ariel_opensuse_org.sls
deleted file mode 100644
index c9be0ec..0000000
--- a/pillar/id/ariel_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/baloo_infra_opensuse_org.sls b/pillar/id/baloo_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/baloo_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/baloo_opensuse_org.sls b/pillar/id/baloo_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/baloo_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/boosters_infra_opensuse_org.sls b/pillar/id/boosters_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/boosters_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/boosters_opensuse_org.sls b/pillar/id/boosters_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/boosters_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/chip_infra_opensuse_org.sls b/pillar/id/chip_infra_opensuse_org.sls
new file mode 100644
index 0000000..b9edcef
--- /dev/null
+++ b/pillar/id/chip_infra_opensuse_org.sls
@@ -0,0 +1,8 @@
+grains:
+  city: nuremberg
+  country: de
+  roles:
+    - ns
+    - ns_slave
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/chip_opensuse_org.sls b/pillar/id/chip_opensuse_org.sls
deleted file mode 100644
index b9edcef..0000000
--- a/pillar/id/chip_opensuse_org.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  roles:
-    - ns
-    - ns_slave
-  salt_cluster: opensuse
-  virt_cluster: atreju
diff --git a/pillar/id/ci-opensuse_infra_opensuse_org.sls b/pillar/id/ci-opensuse_infra_opensuse_org.sls
new file mode 100644
index 0000000..d486f0a
--- /dev/null
+++ b/pillar/id/ci-opensuse_infra_opensuse_org.sls
@@ -0,0 +1,7 @@
+grains:
+  city: nuremberg
+  country: de
+  roles:
+    - jenkins
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/ci-opensuse_opensuse_org.sls b/pillar/id/ci-opensuse_opensuse_org.sls
deleted file mode 100644
index d486f0a..0000000
--- a/pillar/id/ci-opensuse_opensuse_org.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  roles:
-    - jenkins
-  salt_cluster: opensuse
-  virt_cluster: atreju
diff --git a/pillar/id/community_infra_opensuse_org.sls b/pillar/id/community_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/community_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/community_opensuse_org.sls b/pillar/id/community_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/community_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/conference_infra_opensuse_org.sls b/pillar/id/conference_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/conference_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/conference_opensuse_org.sls b/pillar/id/conference_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/conference_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/dale_infra_opensuse_org.sls b/pillar/id/dale_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/dale_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/dale_opensuse_org.sls b/pillar/id/dale_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/dale_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/disquss_infra_opensuse_org.sls b/pillar/id/disquss_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/disquss_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/disquss_opensuse_org.sls b/pillar/id/disquss_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/disquss_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/donald_infra_opensuse_org.sls b/pillar/id/donald_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/donald_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/donald_opensuse_org.sls b/pillar/id/donald_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/donald_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/etherpad_infra_opensuse_org.sls b/pillar/id/etherpad_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/etherpad_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/etherpad_opensuse_org.sls b/pillar/id/etherpad_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/etherpad_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/gaston_infra_opensuse_org.sls b/pillar/id/gaston_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/gaston_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/gaston_opensuse_org.sls b/pillar/id/gaston_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/gaston_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/icc_infra_opensuse_org.sls b/pillar/id/icc_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/icc_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/icc_opensuse_org.sls b/pillar/id/icc_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/icc_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/keyserver_infra_opensuse_org.sls b/pillar/id/keyserver_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/keyserver_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/keyserver_opensuse_org.sls b/pillar/id/keyserver_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/keyserver_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/mickey_infra_opensuse_org.sls b/pillar/id/mickey_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/mickey_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/mickey_opensuse_org.sls b/pillar/id/mickey_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/mickey_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/minnie_infra_opensuse_org.sls b/pillar/id/minnie_infra_opensuse_org.sls
new file mode 100644
index 0000000..7d01a74
--- /dev/null
+++ b/pillar/id/minnie_infra_opensuse_org.sls
@@ -0,0 +1,7 @@
+grains:
+  city: nuremberg
+  country: de
+  roles:
+    - saltmaster
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/minnie_opensuse_org.sls b/pillar/id/minnie_opensuse_org.sls
deleted file mode 100644
index 7d01a74..0000000
--- a/pillar/id/minnie_opensuse_org.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  roles:
-    - saltmaster
-  salt_cluster: opensuse
-  virt_cluster: atreju
diff --git a/pillar/id/monitor_infra_opensuse_org.sls b/pillar/id/monitor_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/monitor_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/monitor_opensuse_org.sls b/pillar/id/monitor_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/monitor_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/narwal2_infra_opensuse_org.sls b/pillar/id/narwal2_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/narwal2_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/narwal2_opensuse_org.sls b/pillar/id/narwal2_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/narwal2_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/narwal3_infra_opensuse_org.sls b/pillar/id/narwal3_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/narwal3_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/narwal3_opensuse_org.sls b/pillar/id/narwal3_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/narwal3_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/narwal_infra_opensuse_org.sls b/pillar/id/narwal_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/narwal_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/narwal_opensuse_org.sls b/pillar/id/narwal_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/narwal_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/nuka_infra_opensuse_org.sls b/pillar/id/nuka_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/nuka_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/nuka_opensuse_org.sls b/pillar/id/nuka_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/nuka_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/redmine_infra_opensuse_org.sls b/pillar/id/redmine_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/redmine_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/redmine_opensuse_org.sls b/pillar/id/redmine_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/redmine_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/roadrunner_infra_opensuse_org.sls b/pillar/id/roadrunner_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/roadrunner_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/roadrunner_opensuse_org.sls b/pillar/id/roadrunner_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/roadrunner_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/simba_infra_opensuse_org.sls b/pillar/id/simba_infra_opensuse_org.sls
new file mode 100644
index 0000000..2b4e48f
--- /dev/null
+++ b/pillar/id/simba_infra_opensuse_org.sls
@@ -0,0 +1,5 @@
+grains:
+  city: nuremberg
+  country: de
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/simba_opensuse_org.sls b/pillar/id/simba_opensuse_org.sls
deleted file mode 100644
index 2b4e48f..0000000
--- a/pillar/id/simba_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/svn2_infra_opensuse_org.sls b/pillar/id/svn2_infra_opensuse_org.sls
new file mode 100644
index 0000000..489e78a
--- /dev/null
+++ b/pillar/id/svn2_infra_opensuse_org.sls
@@ -0,0 +1,9 @@
+grains:
+  city: nuremberg
+  country: de
+  roles:
+    - git
+    - git_daemon
+    - svn
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/svn2_opensuse_org.sls b/pillar/id/svn2_opensuse_org.sls
deleted file mode 100644
index 489e78a..0000000
--- a/pillar/id/svn2_opensuse_org.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  roles:
-    - git
-    - git_daemon
-    - svn
-  salt_cluster: opensuse
-  virt_cluster: atreju
diff --git a/pillar/role/saltmaster.sls b/pillar/role/saltmaster.sls
index dd5dc30..37be05e 100644
--- a/pillar/role/saltmaster.sls
+++ b/pillar/role/saltmaster.sls
@@ -11,7 +11,7 @@ salt:
       - production
     ext_pillar:
       - git:
-          - production gitlab@mickey.opensuse.org:infra/salt.git:
+          - production gitlab@gitlab.opensuse.org:infra/salt.git:
               - env: production
               - root: pillar
               - privkey: /srv/salt/.ssh/salt_gitlab_oo_infra_salt
@@ -21,7 +21,7 @@ salt:
       - git
     gitfs_provider: pygit2
     gitfs_remotes:
-      - gitlab@mickey.opensuse.org:infra/salt.git:
+      - gitlab@gitlab.opensuse.org:infra/salt.git:
           - root: salt
           - privkey: /srv/salt/.ssh/salt_gitlab_oo_infra_salt
           - pubkey: /srv/salt/.ssh/salt_gitlab_oo_infra_salt.pub
diff --git a/pillar/salt_cluster/opensuse.sls b/pillar/salt_cluster/opensuse.sls
index 4fbbcc1..b42e907 100644
--- a/pillar/salt_cluster/opensuse.sls
+++ b/pillar/salt_cluster/opensuse.sls
@@ -1,3 +1,3 @@
 salt:
   minion:
-    master: minnie.opensuse.org
+    master: minnie.infra.opensuse.org
diff --git a/pillar/top.sls b/pillar/top.sls
index a01d4eb..54fa63f 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -30,7 +30,7 @@ production:
   'country:{{ country }}':
     - match: grain
     - country.{{ country }}
-  {% if domain and domain == 'opensuse.org' %}
+  {% if domain and domain == 'infra.opensuse.org' %}
   'domain:{{ domain }}':
     - match: grain
     - domain.{{ domain.replace('.', '_') }}