From 8640fbd5c0389848290fca9d31c8fbd964e1d63d Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 6 Jan 2023 11:53:29 +0100 Subject: [PATCH] Sync kolla_tag with kolla-ansible Without this change, Kayobe was tagging container images with `zed` when kolla-ansible was expecting something like `zed-ubuntu-jammy`. Change-Id: I23c409900db2c37105e7b218bbaedcfacb235787 --- ansible/inventory/group_vars/all/kolla | 7 ++++--- etc/kayobe/kolla.yml | 5 +++-- releasenotes/notes/sync-kolla-tag-e4766b4fb395765e.yaml | 6 ++++++ 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/sync-kolla-tag-e4766b4fb395765e.yaml diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla index daf4fa799..08dcdf95d 100644 --- a/ansible/inventory/group_vars/all/kolla +++ b/ansible/inventory/group_vars/all/kolla @@ -90,9 +90,10 @@ kolla_docker_registry_password: # Default is {{ openstack_release }}. kolla_openstack_release: "{{ openstack_release }}" -# Docker tag applied to built container images. Default is -# {{ kolla_openstack_release }}. -kolla_tag: "{{ kolla_openstack_release }}" +# Docker tag applied to built container images. Default is {{ +# kolla_openstack_release }}-{{ kolla_base_distro }}-{{ +# kolla_base_distro_version }}. +kolla_tag: "{{ kolla_openstack_release }}-{{ kolla_base_distro }}-{{ kolla_base_distro_version }}" # Dict mapping names of sources to their definitions. # See kolla.common.config for details. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 2d975b260..f375547dd 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -102,8 +102,9 @@ # Default is {{ openstack_release }}. #kolla_openstack_release: -# Docker tag applied to built container images. Default is -# {{ kolla_openstack_release }}. +# Docker tag applied to built container images. Default is {{ +# kolla_openstack_release }}-{{ kolla_base_distro }}-{{ +# kolla_base_distro_version }}. #kolla_tag: # Dict mapping names of sources to their definitions. diff --git a/releasenotes/notes/sync-kolla-tag-e4766b4fb395765e.yaml b/releasenotes/notes/sync-kolla-tag-e4766b4fb395765e.yaml new file mode 100644 index 000000000..70bc8848e --- /dev/null +++ b/releasenotes/notes/sync-kolla-tag-e4766b4fb395765e.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Synchronises the default value ``kolla_tag`` with the container image + tagging scheme expected by Kolla Ansible. This ensures images are built + with tags such as ``zed-ubuntu-jammy`` instead of ``zed``.