From e4f703673b4e5360be7e17dbc880d5d00dc67c60 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Thu, 8 Feb 2024 15:48:47 +0000 Subject: [PATCH 1/3] 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. --- etc/kayobe/kolla/globals.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index b156f050a..7930677f8 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -10,6 +10,10 @@ enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names }}{% endraw %}" # This is necessary for os migrations where mixed clouds might be deployed kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}" +# Use facts so this is determined correctly when the control host OS differs +# from os_distribuition. +kolla_base_distro_version: "{% raw %}{{ ansible_facts.distribution_major_version }}{% raw %}" + # Convenience variable for base distro and version string. kolla_base_distro_and_version: "{% raw %}{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{% endraw %}" From 3217a11baf32ecd6c634613fb336e287d04b3dc5 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Thu, 29 Feb 2024 11:07:42 +0000 Subject: [PATCH 2/3] Update etc/kayobe/kolla/globals.yml Co-authored-by: Mark Goddard --- etc/kayobe/kolla/globals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 7930677f8..91021deed 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -12,7 +12,7 @@ kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw % # Use facts so this is determined correctly when the control host OS differs # from os_distribuition. -kolla_base_distro_version: "{% raw %}{{ ansible_facts.distribution_major_version }}{% raw %}" +kolla_base_distro_version: "{% raw %}{{ ansible_facts.distribution_major_version }}{% endraw %}" # Convenience variable for base distro and version string. kolla_base_distro_and_version: "{% raw %}{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{% endraw %}" From b0743ed2c94d3a54d4071c9cc05033c991cedb03 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Fri, 1 Mar 2024 10:48:33 +0000 Subject: [PATCH 3/3] Correctly map kolla_base_distro_version --- etc/kayobe/kolla/globals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 91021deed..83bfd9b74 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -12,7 +12,7 @@ kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw % # Use facts so this is determined correctly when the control host OS differs # from os_distribuition. -kolla_base_distro_version: "{% raw %}{{ ansible_facts.distribution_major_version }}{% endraw %}" +kolla_base_distro_version: "{% raw %}{{ kolla_base_distro_version_default_map[kolla_base_distro] }}{% endraw %}" # Convenience variable for base distro and version string. kolla_base_distro_and_version: "{% raw %}{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{% endraw %}"