From e9595caa9e1a52d2467191e57fd322a0bff5a2ca Mon Sep 17 00:00:00 2001
From: skorpy <magnus@skorpy.space>
Date: Fri, 3 Jan 2025 19:47:19 +0000
Subject: [PATCH] ganeti: update salt install
---
ganeti/files/hooks/30-salt | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/ganeti/files/hooks/30-salt b/ganeti/files/hooks/30-salt
index 65de1aaa..43cd1857 100644
--- a/ganeti/files/hooks/30-salt
+++ b/ganeti/files/hooks/30-salt
@@ -7,27 +7,14 @@ if [ ! -d "$TARGET" ]; then
exit 1
fi
-mkdir -p $TARGET/usr/share/keyrings/
+mkdir -p $TARGET/etc/apt/keyrings/
mkdir -p $TARGET/etc/apt/sources.list.d/
mkdir -p $TARGET/etc/salt/minion.d/
-if [ $SUITE = "stretch" ]; then
- echo 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] https://repo.saltproject.io/py3/debian/9/amd64/3004 stretch main
-' > $TARGET/etc/apt/sources.list.d/saltstack.list
- curl -fsSL -o $TARGET/usr/share/keyrings/salt-archive-keyring.gpg https://repo.saltproject.io/py3/debian/9/amd64/latest/salt-archive-keyring.gpg
-fi
-
-if [ $SUITE = "buster" ]; then
- echo 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] https://repo.saltproject.io/py3/debian/10/amd64/3004 buster main
-' > $TARGET/etc/apt/sources.list.d/saltstack.list
- curl -fsSL -o $TARGET/usr/share/keyrings/salt-archive-keyring.gpg https://repo.saltproject.io/py3/debian/10/amd64/latest/salt-archive-keyring.gpg
-fi
+curl -fsSL -o $TARGET/etc/apt/keyrings/salt-archive-keyring.pgp https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
-if [ $SUITE = "bullseye" ]; then
- echo 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main
+echo 'deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp arch=amd64] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main
' > $TARGET/etc/apt/sources.list.d/saltstack.list
- curl -fsSL -o $TARGET/usr/share/keyrings/salt-archive-keyring.gpg https://repo.saltproject.io/py3/debian/11/amd64/latest/salt-archive-keyring.gpg
-fi
chroot "$TARGET" apt-get update
--
GitLab