Skip to content

Commit b6df668

Browse files
committed
Remove the override to kolla_base_distro & version
When running the kayobe-automation CI on a Zed/Antelope cloud running Ubuntu host images, these variable overrides cause the kolla tags to template incorrectly. For example, a Jammy host gets ``kolla_base_distro_and_version = rocky-jammy``. Given we will not be performing any host OS migrations on Zed (or Antelope), we can remove these overrides and use the default values based on ``os_distribution``. Bug explanation: These variables end up with the following values, meaning the CI picks up rocky but keeps jammy. ``` kolla_base_distro: '{{ ansible_facts.distribution | lower }}' kolla_base_distro_and_version: '{{ kolla_base_distro }}-{{ kolla_base_distro_version}}' kolla_base_distro_version: jammy ``` This is because the variables are first templated under the Kayobe group_vars based on os_distribution, so the version maps to jammy. ``kayobe/ansible/inventory/group/vars/all/kolla`` ``` kolla_base_distro: "{{ os_distribution }}" kolla_base_distro_version_default_map: { "centos": "stream9", "debian": "bullseye", "rocky": "9", "ubuntu": "jammy", } kolla_base_distro_version: "{{ kolla_base_distro_version_default_map[kolla_base_distro] }}" ``` Then, the base distro and the final variable are overwritten in kolla globals kayobe-config/etc/kayobe/kolla/globals.yml ``` kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}" kolla_base_distro_and_version: "{% raw %}{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{% endraw %}" ```
1 parent e4ce4ec commit b6df668

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

etc/kayobe/kolla/globals.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
# non-overcloud hosts
77
enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names }}{% endraw %}"
88

9-
# kolla_base_distro must be set here to be resolvable on a per-host basis
10-
# This is necessary for os migrations where mixed clouds might be deployed
11-
kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}"
12-
13-
# Convenience variable for base distro and version string.
14-
kolla_base_distro_and_version: "{% raw %}{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{% endraw %}"
15-
169
# Dict of Kolla image tags to deploy for each service.
1710
# Each key is the tag variable prefix name, and the value is another dict,
1811
# where the key is the OS distro and the value is the tag to deploy.

0 commit comments

Comments
 (0)