Skip to content

Commit bfa520a

Browse files
committed
Override kolla_base_distro_version
When running the kayobe-automation CI on a Zed/Antelope cloud running Ubuntu host images, the kolla tags to templated incorrectly. For example, a Jammy host gets ``kolla_base_distro_and_version = rocky-jammy``. This is caused by Kayobe's ``globals.yml`` template (``ansible/roles/kolla-ansible/templates/kolla/globals.yml``) setting ``kolla_base_distro_version`` based on Kayobe's variable of the sam name, which references ``os_version``. We can avoid this by explicitly using facts for the version in SKC's ``globals.yml`` template.
1 parent e4ce4ec commit bfa520a

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

etc/kayobe/kolla/globals.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names }}{% endraw %}"
1010
# This is necessary for os migrations where mixed clouds might be deployed
1111
kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}"
1212

13+
# Use facts so this is determined correctly when the control host OS differs
14+
# from os_distribuition.
15+
kolla_base_distro_version: "{{ ansible_facts.distribution_major_version }}"
16+
1317
# Convenience variable for base distro and version string.
1418
kolla_base_distro_and_version: "{% raw %}{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{% endraw %}"
1519

0 commit comments

Comments
 (0)