From 96b73246a8a0f3819e655f895454d43181d18dd5 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Dec 09 2021 17:52:22 +0000
Subject: Minor adjustments for helios


- update pillar/id/ files to reflect that elections2.i.o.o is now
  productive
- update a comment about database upgrades
- add AJV as member of the election officials
- remove lowercase ishwon from election officials, the uppercase one is
  enough ;-)

---

diff --git a/pillar/id/elections2_infra_opensuse_org.sls b/pillar/id/elections2_infra_opensuse_org.sls
index 53ba6d5..8a1eca0 100644
--- a/pillar/id/elections2_infra_opensuse_org.sls
+++ b/pillar/id/elections2_infra_opensuse_org.sls
@@ -10,13 +10,12 @@ grains:
   virt_cluster: atreju
 
   aliases: []
-  description: New board voting system, powered by helios-server - currently in development
+  description: board voting system, powered by helios-server
   documentation:
     - https://progress.opensuse.org/issues/25486
   responsible:
     - cboltz
     - scarabeus_iv
-  partners:
-    - sarabi.infra.opensuse.org
+  partners: []
   weburls:
-    - https://elections-test.opensuse.org
+    - https://elections.opensuse.org
diff --git a/pillar/id/sarabi_infra_opensuse_org.sls b/pillar/id/sarabi_infra_opensuse_org.sls
index 8a1eca0..0ad672a 100644
--- a/pillar/id/sarabi_infra_opensuse_org.sls
+++ b/pillar/id/sarabi_infra_opensuse_org.sls
@@ -10,12 +10,12 @@ grains:
   virt_cluster: atreju
 
   aliases: []
-  description: board voting system, powered by helios-server
+  description: OLD board voting system, powered by helios-server
   documentation:
     - https://progress.opensuse.org/issues/25486
   responsible:
     - cboltz
     - scarabeus_iv
   partners: []
-  weburls:
-    - https://elections.opensuse.org
+  weburls: []
+#   - https://elections.opensuse.org
diff --git a/pillar/role/web_elections.sls b/pillar/role/web_elections.sls
index 33d50be..7406e3a 100644
--- a/pillar/role/web_elections.sls
+++ b/pillar/role/web_elections.sls
@@ -42,7 +42,7 @@ profile:
       # admins
       - cboltz
       # election officials
-      - ishwon
+      - AJV
       - Ishwon
       - medwin
     help_email_address: election-officials@opensuse.org
diff --git a/salt/profile/helios/init.sls b/salt/profile/helios/init.sls
index fab7a46..07cbc57 100644
--- a/salt/profile/helios/init.sls
+++ b/salt/profile/helios/init.sls
@@ -41,5 +41,5 @@ rabbitmq-server:
   service.running:
     - enable: True
 
-# manual steps for database setup:
-# run the two "python manage.py" commands listed in /usr/lib/python*/site-packages/helios-server/reset.sh
+# manual steps for database setup (also after upgrades):
+# run the two "python3 manage.py" commands listed in /usr/lib/python*/site-packages/helios-server/reset.sh