openstack/kayobe
Code Issues Proposed changes

Sync kolla_tag with kolla-ansible

Browse Source 
Without this change, Kayobe was tagging container images with `zed` when
kolla-ansible was expecting something like `zed-ubuntu-jammy`.

Change-Id: I23c409900db2c37105e7b218bbaedcfacb235787
This commit is contained in:
Pierre Riteau 2023-01-06 11:53:29 +01:00
parent ee25470b01
commit 8640fbd5c0
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/inventory/group_vars/all/kolla
View File

@ -90,9 +90,10 @@ kolla_docker_registry_password:
# Default is {{ openstack_release }}. # Default is {{ openstack_release }}.
kolla_openstack_release: "{{ openstack_release }}" kolla_openstack_release: "{{ openstack_release }}"
# Docker tag applied to built container images. Default is # Docker tag applied to built container images. Default is {{
# {{ kolla_openstack_release }}. # kolla_openstack_release }}-{{ kolla_base_distro }}-{{
kolla_tag: "{{ kolla_openstack_release }}" # kolla_base_distro_version }}.
kolla_tag: "{{ kolla_openstack_release }}-{{ kolla_base_distro }}-{{ kolla_base_distro_version }}"
# Dict mapping names of sources to their definitions. # Dict mapping names of sources to their definitions.
# See kolla.common.config for details. # See kolla.common.config for details.

5
etc/kayobe/kolla.yml
View File

@ -102,8 +102,9 @@
# Default is {{ openstack_release }}. # Default is {{ openstack_release }}.
#kolla_openstack_release: #kolla_openstack_release:
# Docker tag applied to built container images. Default is # Docker tag applied to built container images. Default is {{
# {{ kolla_openstack_release }}. # kolla_openstack_release }}-{{ kolla_base_distro }}-{{
# kolla_base_distro_version }}.
#kolla_tag: #kolla_tag:
# Dict mapping names of sources to their definitions. # Dict mapping names of sources to their definitions.

6
releasenotes/notes/sync-kolla-tag-e4766b4fb395765e.yaml Normal file
View File

@ -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``.