From 4f93e05918af8a969eb767cd1ba652095262e08d Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 26 2021 20:21:51 +0000
Subject: Merge branch 'lrupp_add_hosts' into 'production'


Add some machines that are running since months or years now:

See merge request infra/salt!492
---

diff --git a/pillar/id/community2_infra_opensuse_org.sls b/pillar/id/community2_infra_opensuse_org.sls
new file mode 100644
index 0000000..cd9d106
--- /dev/null
+++ b/pillar/id/community2_infra_opensuse_org.sls
@@ -0,0 +1,15 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - factory-dashboard
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: New machine for several old services (see community) that need to be migrated to new VMs
+  documentation: []
+  responsible: []
+  partners: []
+  weburls: []
diff --git a/pillar/id/elections2_infra_opensuse_org.sls b/pillar/id/elections2_infra_opensuse_org.sls
new file mode 100644
index 0000000..53ba6d5
--- /dev/null
+++ b/pillar/id/elections2_infra_opensuse_org.sls
@@ -0,0 +1,22 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - elections.o.o
+  roles:
+    - web_elections
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: New board voting system, powered by helios-server - currently in development
+  documentation:
+    - https://progress.opensuse.org/issues/25486
+  responsible:
+    - cboltz
+    - scarabeus_iv
+  partners:
+    - sarabi.infra.opensuse.org
+  weburls:
+    - https://elections-test.opensuse.org
diff --git a/pillar/id/fedora-accounts_infra_opensuse_org.sls b/pillar/id/fedora-accounts_infra_opensuse_org.sls
new file mode 100644
index 0000000..0b05d22
--- /dev/null
+++ b/pillar/id/fedora-accounts_infra_opensuse_org.sls
@@ -0,0 +1,17 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage: []
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Testing machine for the new IDP system.
+  documentation: []
+  responsible:
+    - hellcp
+    - Pharaoh_Atem
+  partners: []
+  weburls: []
diff --git a/pillar/id/fedora-freeipa_infra_opensuse_org.sls b/pillar/id/fedora-freeipa_infra_opensuse_org.sls
new file mode 100644
index 0000000..6270d56
--- /dev/null
+++ b/pillar/id/fedora-freeipa_infra_opensuse_org.sls
@@ -0,0 +1,17 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage: []
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Testing machine for the new FreeIPA system.
+  documentation: []
+  responsible:
+    - hellcp
+    - Pharaoh_Atem
+  partners: []
+  weburls: []
diff --git a/pillar/id/fedora-sso_infra_opensuse_org.sls b/pillar/id/fedora-sso_infra_opensuse_org.sls
new file mode 100644
index 0000000..44e0ba9
--- /dev/null
+++ b/pillar/id/fedora-sso_infra_opensuse_org.sls
@@ -0,0 +1,17 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage: []
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Testing machine for the new SingleSingOn system.
+  documentation: []
+  responsible:
+    - hellcp
+    - Pharaoh_Atem
+  partners: []
+  weburls: []
diff --git a/pillar/id/galera1_infra_opensuse_org.sls b/pillar/id/galera1_infra_opensuse_org.sls
index 8ca9174..d5784ba 100644
--- a/pillar/id/galera1_infra_opensuse_org.sls
+++ b/pillar/id/galera1_infra_opensuse_org.sls
@@ -9,9 +9,11 @@ grains:
 
   aliases: []
   description: Node of the MySQL cluster based on Galera
-  documentation: []
+  documentation: 
+    - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/Galera_Cluster
   responsible:
     - kbabioch
+    - lrupp
   partners:
     - galera2.infra.opensuse.org
     - galera3.infra.opensuse.org
diff --git a/pillar/id/galera2_infra_opensuse_org.sls b/pillar/id/galera2_infra_opensuse_org.sls
index 97d40e4..b9a6c5f 100644
--- a/pillar/id/galera2_infra_opensuse_org.sls
+++ b/pillar/id/galera2_infra_opensuse_org.sls
@@ -9,9 +9,11 @@ grains:
 
   aliases: []
   description: Node of the MySQL cluster based on Galera
-  documentation: []
+  documentation:
+    - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/Galera_Cluster
   responsible:
     - kbabioch
+    - lrupp
   partners:
     - galera1.infra.opensuse.org
     - galera3.infra.opensuse.org
diff --git a/pillar/id/galera3_infra_opensuse_org.sls b/pillar/id/galera3_infra_opensuse_org.sls
index 8ca9174..0e42102 100644
--- a/pillar/id/galera3_infra_opensuse_org.sls
+++ b/pillar/id/galera3_infra_opensuse_org.sls
@@ -9,9 +9,11 @@ grains:
 
   aliases: []
   description: Node of the MySQL cluster based on Galera
-  documentation: []
+  documentation:
+    - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/Galera_Cluster
   responsible:
     - kbabioch
+    - lrupp
   partners:
     - galera2.infra.opensuse.org
     - galera3.infra.opensuse.org
diff --git a/pillar/id/gitlab-runner1_infra_opensuse_org.sls b/pillar/id/gitlab-runner1_infra_opensuse_org.sls
new file mode 100644
index 0000000..e6d5d6e
--- /dev/null
+++ b/pillar/id/gitlab-runner1_infra_opensuse_org.sls
@@ -0,0 +1,20 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - gitlab runner
+  roles:
+    - gitlab_runner
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: GitLab Runner
+  documentation: 
+    - https://docs.gitlab.com/runner/
+  responsible:
+    - lrupp
+  partners: 
+    - gitlab-runner2.infra.opensuse.org
+  weburls: []
diff --git a/pillar/id/gitlab-runner2_infra_opensuse_org.sls b/pillar/id/gitlab-runner2_infra_opensuse_org.sls
new file mode 100644
index 0000000..e6d5d6e
--- /dev/null
+++ b/pillar/id/gitlab-runner2_infra_opensuse_org.sls
@@ -0,0 +1,20 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - gitlab runner
+  roles:
+    - gitlab_runner
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: GitLab Runner
+  documentation: 
+    - https://docs.gitlab.com/runner/
+  responsible:
+    - lrupp
+  partners: 
+    - gitlab-runner2.infra.opensuse.org
+  weburls: []
diff --git a/pillar/id/kubic_infra_opensuse_org.sls b/pillar/id/kubic_infra_opensuse_org.sls
index e0869af..89ffd54 100644
--- a/pillar/id/kubic_infra_opensuse_org.sls
+++ b/pillar/id/kubic_infra_opensuse_org.sls
@@ -3,7 +3,7 @@ grains:
   country: de
   hostusage:
     - kubic.o.o
-  reboot_safe: unknown
+  reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
 
diff --git a/pillar/id/ldap-proxy_infra_opensuse_org.sls b/pillar/id/ldap-proxy_infra_opensuse_org.sls
new file mode 100644
index 0000000..6d7034b
--- /dev/null
+++ b/pillar/id/ldap-proxy_infra_opensuse_org.sls
@@ -0,0 +1,19 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - idp proxy server
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: openID login proxy paired with the new IDP services
+  documentation: []
+  responsible:
+    - bmwiedemann 
+  partners: []
+  weburls:
+    - https://www.opensuse.org/openid
+    - https://id.opensuse.org/
diff --git a/pillar/id/mirrorcache-us_infra_opensuse_org.sls b/pillar/id/mirrorcache-us_infra_opensuse_org.sls
new file mode 100644
index 0000000..b9f8d48
--- /dev/null
+++ b/pillar/id/mirrorcache-us_infra_opensuse_org.sls
@@ -0,0 +1,19 @@
+grains:
+  city: provo
+  country: us
+  hostusage:
+    - mirrorcache
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: bryce
+
+  aliases: []
+  description: Productive server for MirrorBrain in the US
+  documentation:
+    - https://mirrorbrain.org/
+  responsible:
+    - anikitin
+  partners: []
+  weburls:
+    - https://mirrorcache-us.opensuse.org/
diff --git a/pillar/id/mirrorcache2_infra_opensuse_org.sls b/pillar/id/mirrorcache2_infra_opensuse_org.sls
new file mode 100644
index 0000000..45ab10f
--- /dev/null
+++ b/pillar/id/mirrorcache2_infra_opensuse_org.sls
@@ -0,0 +1,19 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - mirrorcache
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Productive server for MirrorBrain in the EU
+  documentation:
+    - https://mirrorbrain.org/
+  responsible:
+    - anikitin
+  partners: []
+  weburls:
+    - https://mirrorcache-eu.opensuse.org/
diff --git a/pillar/id/mybackup_infra_opensuse_org.sls b/pillar/id/mybackup_infra_opensuse_org.sls
index 96cda58..31e5d04 100644
--- a/pillar/id/mybackup_infra_opensuse_org.sls
+++ b/pillar/id/mybackup_infra_opensuse_org.sls
@@ -9,7 +9,8 @@ grains:
 
   aliases: []
   description: Backup server for the Galera Cluster
-  documentation: []
+  documentation:
+    - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/Galera_Cluster
   responsible:
     - lrupp
   partners:
diff --git a/pillar/id/provo-galera1_infra_opensuse_org.sls b/pillar/id/provo-galera1_infra_opensuse_org.sls
new file mode 100644
index 0000000..3b83aca
--- /dev/null
+++ b/pillar/id/provo-galera1_infra_opensuse_org.sls
@@ -0,0 +1,22 @@
+grains:
+  city: provo
+  country: us
+  hostusage:
+    - Galera node (MySQL)
+  roles: []
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: bryce
+
+  aliases: 
+    - galera4.infra.opensuse.org
+  description: Node for the MySQL cluster in Provo based on Galera
+  documentation: 
+    - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/Galera_Cluster
+  responsible:
+    - lrupp
+  partners:
+    - galera1.infra.opensuse.org
+    - galera2.infra.opensuse.org
+    - galera3.infra.opensuse-org
+  weburls: []
diff --git a/salt/profile/gitlab_runner/init.sls b/salt/profile/gitlab_runner/init.sls
index 43bb6f1..f7b2902 100644
--- a/salt/profile/gitlab_runner/init.sls
+++ b/salt/profile/gitlab_runner/init.sls
@@ -1,7 +1,7 @@
 gitlab_runner_packages:
   pkg.installed:
     - pkgs:
-      - git
+      - git-core
 
 gitlab_runner:
   pkg.installed:
diff --git a/salt/role/gitlab_runner.sls b/salt/role/gitlab_runner.sls
new file mode 100644
index 0000000..5618782
--- /dev/null
+++ b/salt/role/gitlab_runner.sls
@@ -0,0 +1,2 @@
+include:
+  - profile.gitlab_runner