Skip to content

Commit a729cad

Browse files
committed
test
1 parent 212e759 commit a729cad

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

etc/kayobe/kolla.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
7272

7373
# Kolla base container image distribution version.
7474
# Default is kolla_base_distro_version_default_map[kolla_base_distro].
75-
kolla_base_distro_version: "{{ kolla_base_distro_version }}"
76-
distro_python_verion: "{{ '3.12' if kolla_base_distro_version == 'noble' else omit }}"
75+
# kolla_base_distro_version: "{{ kolla_base_distro_version }}"
7776

7877
kolla_base_distro_and_version: "{{ kolla_base_distro }}-{{ kolla_base_distro_version }}"
7978

@@ -325,7 +324,12 @@ kolla_build_blocks:
325324
# With the UCA keyring installed we can now add all repos.
326325
base_ubuntu_package_sources_list: |
327326
{% if stackhpc_kolla_clean_up_repo_mirrors | bool %}
328-
COPY sources.list.ubuntu /etc/apt/sources.list.backup
327+
{% if kolla_base_distro_version == 'jammy' %}
328+
COPY sources.list.jammy /etc/apt/sources.list.backup
329+
{% else %}
330+
COPY sources.list.noble /etc/apt/sources.list.backup
331+
{% endif %}
332+
329333
{% endif %}
330334
RUN \
331335
rm /etc/apt/sources.list && \

etc/kayobe/kolla/globals.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ kolla_base_distro_version: "{% raw %}{{ kolla_base_distro_version_default_map[ko
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+
distro_python_verion: "{{ '3.12' if kolla_base_distro_version == 'noble' else omit }}"
16+
1517
# Dict of Kolla image tags to deploy for each service.
1618
# Each key is the tag variable prefix name, and the value is another dict,
1719
# where the key is the OS distro and the value is the tag to deploy.

0 commit comments

Comments
 (0)