Skip to content

Commit 45ac484

Browse files
committed
local changes for rocky 9.3 kernel, package and container upgrade
1 parent 594692a commit 45ac484

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

etc/kayobe/cephadm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Cephadm deployment configuration.
44

55
# Ceph release name.
6-
cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == 'jammy') else 'pacific' }}"
6+
cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == 'jammy') or (ansible_facts['distribution_release'] == '9') else 'pacific' }}"
77

88
# Ceph FSID.
99
#cephadm_fsid:
@@ -12,7 +12,7 @@ cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] ==
1212
cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}"
1313

1414
# Ceph container image tag.
15-
cephadm_image_tag: "{{ 'v17.2.7' if os_release == 'jammy' else 'v16.2.14' }}"
15+
cephadm_image_tag: "{{ 'v17.2.7' if (os_release == 'jammy') or (os_release == '9') else 'v16.2.14' }}"
1616

1717
# Ceph custom repo workaround for Ubuntu Jammy as there are no official ceph repos for jammy.
1818
cephadm_custom_repos: "{{ ansible_facts['distribution_release'] == 'jammy' }}"

etc/kayobe/dnf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ rocky_9_gpg_key: "https://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9"
200200

201201
# Whether to create a repo file for ELRepo. This affects RedHat-based
202202
# systems only.
203-
dnf_install_elrepo_9: false
203+
dnf_install_elrepo_9: true
204204

205205
# Whether to enable docker dnf repo in stackhpc_dnf_repos
206206
dnf_enable_docker: true

etc/kayobe/kolla/globals.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ kolla_base_distro: "{% raw %}{{ 'centos' if ansible_facts.distribution == 'Rocky
1313
kayobe_image_tags:
1414
openstack:
1515
centos: yoga-20231024T093507
16-
rocky: yoga-20231211T151419
16+
rocky: yoga-20231218T141822
1717
ubuntu: yoga-20231024T093507
1818
nova:
1919
centos: yoga-20231113T171023
20-
rocky: yoga-20231211T151419
20+
rocky: yoga-20240105T120257
2121
ubuntu: yoga-20231103T161400
2222
cloudkitty:
2323
centos: yoga-20231107T165648
24-
rocky: yoga-20231211T151419
24+
rocky: yoga-20231218T141822
2525
ubuntu: yoga-20231107T165648
2626
neutron:
2727
centos: yoga-20231114T125927
28-
rocky: yoga-20231211T151419
28+
rocky: yoga-20240105T120257
2929
ubuntu: yoga-20231114T125927
3030

3131
cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}"

etc/kayobe/stackhpc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ stackhpc_repo_epel_9_version: "{{ stackhpc_repo_distribution }}"
199199

200200
# ELRepo 9
201201
stackhpc_repo_elrepo_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/elrepo/elrepo/el9/x86_64/{{ stackhpc_repo_elrepo_9_version }}"
202-
stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
202+
stackhpc_repo_elrepo_9_version: "20230907T075311"
203203

204204
###############################################################################
205205
# Sources

0 commit comments

Comments
 (0)