a3ccf6fb01
This patch does 2 things (on purpose for easier backport without CI
failures):
1) TCIB: add "kolla_version" for backward compatibility
In TripleO CI, we run container updates using tripleo-modify-image role
but only for the images with "kolla_version" label.
https://opendev.org/openstack/tripleo-quickstart-extras/src/branch/master/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2#L13
In the future, we'll rename this LABEL to be more TCIB specific and
remove "kolla" from it, but for now let's have it for backward
compatibility.
2) image_uploader: relax logic for filter_images_with_labels()
modify_only_with_labels is a list of labels that can be set to find out
what images we want to modify with the tripleo-modify-image role.
Before, all the items in the list must be present in the image Labels;
which is too strict (e.g. kolla_version label used by quickstart doesn't
exist in the new images with TCIB).
Let's relax it so we will modify the image if at least one label is
present in there.
Related-Bug: #1886914
Change-Id: Ia9b75f8a50c83fc38d7a4f6d5e6a9726d82fbd8c
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| kolla | ||
| tcib/base | ||
| container_image_prepare_defaults.yaml | ||
| overcloud_containers.yaml | ||
| overcloud_containers.yaml.j2 | ||
| tripleo_containers.yaml | ||
| tripleo_kolla_config_overrides.conf | ||
| tripleo_kolla_template_overrides.j2 | ||