Skip to content

Commit 9fd00c9

Browse files
committed
Override K-A python version and base distro version for noble
1 parent 8e61f6f commit 9fd00c9

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

etc/kayobe/kolla/globals.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,19 @@ kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %
77

88
# Use facts so this is determined correctly when the control host OS differs
99
# from os_distribuition.
10-
kolla_base_distro_version: "{% raw %}{{ kolla_base_distro_version_default_map[kolla_base_distro] }}{% endraw %}"
10+
kolla_base_distro_version: "{% raw %}{{ 'noble' if ansible_facts.distribution_release == 'noble' else kolla_base_distro_version_default_map[kolla_base_distro] }}{% endraw %}"
1111

1212
# Convenience variable for base distro and version string.
1313
kolla_base_distro_and_version: "{% raw %}{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{% endraw %}"
1414

15+
kolla_base_distro_version_custom_map: {
16+
"rocky-9": "3.9",
17+
"ubuntu-jammy": "3.10",
18+
"ubuntu-noble": "3.12"
19+
}
20+
21+
distro_python_version: "{% raw %}{{ kolla_base_distro_version_custom_map[kolla_base_distro_and_version] }}{% endraw %}"
22+
1523
# Dict of Kolla image tags to deploy for each service.
1624
# Each key is the tag variable prefix name, and the value is another dict,
1725
# where the key is the OS distro and the value is the tag to deploy.

0 commit comments

Comments
 (0)