Skip to content

Commit ad58b39

Browse files
committed
Only enable Ubuntu repos match current dist release
1 parent 0a5750a commit ad58b39

File tree

1 file changed

+10
-26
lines changed

1 file changed

+10
-26
lines changed

etc/kayobe/apt.yml

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -50,50 +50,34 @@ apt_keys:
5050
# (optional, default is unset)
5151
# Default is an empty list.
5252
stackhpc_apt_repositories:
53-
- url: "{{ stackhpc_repo_ubuntu_jammy_url }}"
53+
- url: "{{ stackhpc_repo_ubuntu_noble_url if ansible_facts.distribution_release == 'noble' else stackhpc_repo_ubuntu_jammy_url }}"
5454
suites: "{{ ansible_facts.distribution_release }} {{ ansible_facts.distribution_release }}-updates {{ ansible_facts.distribution_release }}-backports"
5555
components: main restricted universe multiverse
5656
architecture: amd64
5757
required: true
58-
- url: "{{ stackhpc_repo_ubuntu_jammy_security_url }}"
58+
- url: "{{ stackhpc_repo_ubuntu_noble_security_url if ansible_facts.distribution_release == 'noble' else stackhpc_repo_ubuntu_jammy_security_url }}"
5959
suites: "{{ ansible_facts.distribution_release }}-security"
6060
components: main restricted universe multiverse
6161
architecture: amd64
6262
required: true
63+
- url: "{{ stackhpc_repo_docker_ce_ubuntu_noble_url if ansible_facts.distribution_release == 'noble' else stackhpc_repo_docker_ce_ubuntu_jammy_url }}"
64+
suites: "{{ ansible_facts.distribution_release }}"
65+
components: stable
66+
signed_by: docker.asc
67+
architecture: amd64
68+
required: true
6369
- url: "{{ stackhpc_repo_ubuntu_jammy_cve_2024_6387_url }}"
6470
suites: "pulp"
6571
components: upload
6672
architecture: amd64
6773
trusted: yes
68-
required: true
69-
- url: "{{ stackhpc_repo_docker_ce_ubuntu_jammy_url }}"
70-
suites: "{{ ansible_facts.distribution_release }}"
71-
components: stable
72-
signed_by: docker.asc
73-
architecture: amd64
74-
required: true
74+
required: "{{ ansible_facts.distribution_release == 'jammy' }}"
7575
- url: "{{ stackhpc_repo_ceph_reef_debian_url }}"
7676
suites: "{{ ansible_facts.distribution_release }}"
7777
components: main
7878
signed_by: ceph.asc
7979
architecture: amd64
80-
required: true
81-
- url: "{{ stackhpc_repo_ubuntu_noble_url }}"
82-
suites: "{{ ansible_facts.distribution_release }} {{ ansible_facts.distribution_release }}-updates {{ ansible_facts.distribution_release }}-backports"
83-
components: main restricted universe multiverse
84-
architecture: amd64
85-
required: true
86-
- url: "{{ stackhpc_repo_ubuntu_noble_security_url }}"
87-
suites: "{{ ansible_facts.distribution_release }}-security"
88-
components: main restricted universe multiverse
89-
architecture: amd64
90-
required: true
91-
- url: "{{ stackhpc_repo_docker_ce_ubuntu_noble_url }}"
92-
suites: "{{ ansible_facts.distribution_release }}"
93-
components: stable
94-
signed_by: docker.asc
95-
architecture: amd64
96-
required: true
80+
required: "{{ ansible_facts.distribution_release == 'jammy' }}"
9781

9882
# Do not replace apt configuration for non-overcloud hosts. This can result in
9983
# errors if apt reconfiguration is performed before local repository mirrors

0 commit comments

Comments
 (0)