test

Author: seunghun1ee

etc/kayobe/kolla.yml

@@ -72,8 +72,7 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
 
 # Kolla base container image distribution version.
 # Default is kolla_base_distro_version_default_map[kolla_base_distro].
-kolla_base_distro_version: "{{ kolla_base_distro_version }}"
-distro_python_verion: "{{ '3.12' if kolla_base_distro_version == 'noble' else omit }}"
+# kolla_base_distro_version: "{{ kolla_base_distro_version }}"
 
 kolla_base_distro_and_version: "{{ kolla_base_distro }}-{{ kolla_base_distro_version }}"
 
@@ -325,7 +324,12 @@ kolla_build_blocks:
   # With the UCA keyring installed we can now add all repos.
   base_ubuntu_package_sources_list: |
     {% if stackhpc_kolla_clean_up_repo_mirrors | bool %}
-    COPY sources.list.ubuntu /etc/apt/sources.list.backup
+    {% if kolla_base_distro_version == 'jammy' %}
+    COPY sources.list.ubuntu.jammy /etc/apt/sources.list.backup
+    {% else %}
+    COPY sources.list.ubuntu.noble /etc/apt/sources.list.backup
+    {% endif %}
+
     {% endif %}
     RUN \
         rm /etc/apt/sources.list && \

etc/kayobe/kolla/globals.yml

@@ -12,6 +12,8 @@ kolla_base_distro_version: "{% raw %}{{ kolla_base_distro_version_default_map[ko
 # Convenience variable for base distro and version string.
 kolla_base_distro_and_version: "{% raw %}{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{% endraw %}"
 
+distro_python_verion: "{{ '3.12' if kolla_base_distro_version == 'noble' else omit }}"
+
 # Dict of Kolla image tags to deploy for each service.
 # Each key is the tag variable prefix name, and the value is another dict,
 # where the key is the OS distro and the value is the tag to deploy.