Merge "Remove special handling for python3.12"

2 files changed, 0 insertions, 23 deletions

diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2
index 27e3455e9..a84f0e0e3 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/docker/bifrost/bifrost-base/Dockerfile.j2
@@ -19,11 +19,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {# NOTE(mgoddard): EPEL required for nginx #}
 {{ macros.enable_extra_repos(['epel']) }}
-
-    {% set bifrost_base_packages = bifrost_base_packages + [
-        'python3.12',
-        'python3.12-devel'
-    ] %}
 {% endif %}
 
 {{ macros.install_packages(bifrost_base_packages | customizable("packages")) }}
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index b480a041c..1934b277c 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -61,24 +61,6 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
 {% endif %}
 {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
 
-{# NOTE(kevko):
-  In all distros, there is always a /usr/bin/python3 -> python3.X.
-  However, this is disrupted for RHEL-based systems because, unlike
-  other distros, we upgrade Python above [1], but we forget to set
-  the default python3 to the new python3.X. As a result also, everything
-  outside of the virtual environment ends up running on Python 3.9.
-
-  So, let's correctly set python3 -> python3.X since we had to install
-  it and now have default python3 points to the new version.
-
-  [1] https://review.opendev.org/c/openstack/kolla/+/924245
-#}
-{% if base_package_type == 'rpm' %}
-RUN cd /usr/bin && \
-    rm -f python3 && \
-    ln -s python3.12 python3
-{% endif %}
-
 {% block kolla_toolbox_pip_conf %}
 ENV UPPER_CONSTRAINTS_FILE=https://releases.openstack.org/constraints/upper/{{ openstack_release }}
 {% endblock %}