Standardize python version paths
This patch removes the hardcoded `distro_python_version` mapping and usage from the configuration and templates, aligning with the dynamic Python version detection introduced in the dependent patch below. The changes simplify the kolla-ansible roles by using general `python3` paths, ensuring compatibility across distributions without requiring version-specific handling. Template files for Horizon, Ironic, Skyline, and others have been updated to reflect this, improving maintainability and reducing complexity. Depends-On: https://review.opendev.org/c/openstack/kolla/+/926744 Change-Id: I85431b058b4184d96600cf17aaf8de871a018d61
This commit is contained in:
parent
0a6dd4210b
commit
91a4d8f74b
@ -1268,13 +1268,6 @@ influxdb_internal_endpoint: "{{ kolla_internal_fqdn | kolla_url(internal_protoco
|
||||
#########################
|
||||
# Internal Image options
|
||||
#########################
|
||||
distro_python_version_map: {
|
||||
"centos": "3.9",
|
||||
"debian": "3.11",
|
||||
"rocky": "3.9",
|
||||
"ubuntu": "3.10"
|
||||
}
|
||||
|
||||
kolla_base_distro_version_default_map: {
|
||||
"centos": "stream9",
|
||||
"debian": "bookworm",
|
||||
@ -1282,7 +1275,7 @@ kolla_base_distro_version_default_map: {
|
||||
"ubuntu": "jammy",
|
||||
}
|
||||
|
||||
distro_python_version: "{{ distro_python_version_map[kolla_base_distro] }}"
|
||||
distro_python_version: "3"
|
||||
|
||||
kolla_base_distro_version: "{{ kolla_base_distro_version_default_map[kolla_base_distro] }}"
|
||||
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
Global variable ``distro_python_version`` now defaults to `"3"`.
|
@ -35,10 +35,6 @@ docker_custom_config:
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if kolla_python_version is defined and not is_previous_release %}
|
||||
distro_python_version: "{{ kolla_python_version }}"
|
||||
{% endif %}
|
||||
|
||||
# MariaDB/Galera - fine tune timeouts
|
||||
mariadb_wsrep_extra_provider_options:
|
||||
- "gmcast.peer_timeout=PT15S"
|
||||
|
Loading…
x
Reference in New Issue
Block a user