Merge "Relax filter_images_with_labels() and re-add kolla_version" into stable/ussuri
This commit is contained in:
commit
e21372fcc9
|
@ -34,6 +34,7 @@ tcib_envs:
|
||||||
tcib_gather_files: '{{ lookup(''fileglob'', ''/usr/share/tripleo-common/container-images/kolla/base/*'', wantlist=True) }}'
|
tcib_gather_files: '{{ lookup(''fileglob'', ''/usr/share/tripleo-common/container-images/kolla/base/*'', wantlist=True) }}'
|
||||||
tcib_labels:
|
tcib_labels:
|
||||||
maintainer: OpenStack TripleO team
|
maintainer: OpenStack TripleO team
|
||||||
|
kolla_version: none
|
||||||
tcib_packages:
|
tcib_packages:
|
||||||
common:
|
common:
|
||||||
- ca-certificates
|
- ca-certificates
|
||||||
|
|
|
@ -987,8 +987,15 @@ class BaseImageUploader(object):
|
||||||
raise
|
raise
|
||||||
image_labels = self._image_labels(
|
image_labels = self._image_labels(
|
||||||
url, session=session)
|
url, session=session)
|
||||||
if set(labels).issubset(set(image_labels)):
|
# The logic is the following: if one of the labels in
|
||||||
images_with_labels.append(image)
|
# modify_only_with_labels parameter is present in the image, it
|
||||||
|
# will match and add the images that need to be modified.
|
||||||
|
for label in labels:
|
||||||
|
if label in image_labels:
|
||||||
|
# we found a matching label, adding the image
|
||||||
|
# and leave the loop.
|
||||||
|
images_with_labels.append(image)
|
||||||
|
break
|
||||||
|
|
||||||
return images_with_labels
|
return images_with_labels
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue