Skip to content

Commit a822ca4

Browse files
committed
fix: udpate salt minion setup
1 parent 5bc0e33 commit a822ca4

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed
Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,47 @@
11
- name: Add apt repository for Saltstack (arm)
22
block:
3-
- name: Ensure keyrings directory exists
4-
ansible.builtin.file:
3+
- name: Ensure /etc/apt/keyrings directory exists
4+
file:
55
path: /etc/apt/keyrings
66
state: directory
77
mode: '0755'
88

9-
- name: Download Salt Project public key
9+
- name: salt gpg key
1010
ansible.builtin.get_url:
1111
url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
12-
dest: /etc/apt/keyrings/salt-archive-keyring.pgp
12+
dest: /etc/apt/keyrings/salt-archive-keyring-2023.pgp
1313
mode: '0644'
1414

15-
- name: Add Salt repository sources
16-
ansible.builtin.get_url:
17-
url: https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources
18-
dest: /etc/apt/sources.list.d/salt.sources
19-
mode: '0644'
15+
- name: salt apt repo
16+
ansible.builtin.apt_repository:
17+
repo: "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.pgp arch=arm64] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main"
18+
filename: 'salt.list'
19+
state: present
2020
when: platform == "arm64"
2121

2222
- name: Add apt repository for Saltstack (amd)
2323
block:
24+
- name: Ensure /etc/apt/keyrings directory exists
25+
file:
26+
path: /etc/apt/keyrings
27+
state: directory
28+
mode: '0755'
29+
2430
- name: salt gpg key
25-
ansible.builtin.apt_key:
26-
url: https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg
27-
keyring: /etc/apt/trusted.gpg.d/salt-archive-keyring-2023-amd.gpg
31+
ansible.builtin.get_url:
32+
url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
33+
dest: /etc/apt/keyrings/salt-archive-keyring-2023.pgp
34+
mode: '0644'
2835

2936
- name: salt apt repo
3037
ansible.builtin.apt_repository:
31-
repo: deb [signed-by=/etc/apt/trusted.gpg.d/salt-archive-keyring-2023-amd.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/{{ salt_minon_version }} focal main
38+
repo: "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.pgp arch=amd64] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main"
39+
filename: 'salt.list'
3240
state: present
3341
when: platform == "amd64"
3442

3543
- name: Salt minion install
3644
apt:
3745
name: salt-minion
46+
state: present
47+
update_cache: yes

0 commit comments

Comments
 (0)