Browse Source

Merge "Relax filter_images_with_labels() and re-add kolla_version" into stable/ussuri

tags/12.4.1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
e21372fcc9
2 changed files with 10 additions and 2 deletions
  1. +1
    -0
      container-images/tcib/base/base.yaml
  2. +9
    -2
      tripleo_common/image/image_uploader.py

+ 1
- 0
container-images/tcib/base/base.yaml View File

@@ -34,6 +34,7 @@ tcib_envs:
tcib_gather_files: '{{ lookup(''fileglob'', ''/usr/share/tripleo-common/container-images/kolla/base/*'', wantlist=True) }}'
tcib_labels:
maintainer: OpenStack TripleO team
kolla_version: none
tcib_packages:
common:
- ca-certificates


+ 9
- 2
tripleo_common/image/image_uploader.py View File

@@ -987,8 +987,15 @@ class BaseImageUploader(object):
raise
image_labels = self._image_labels(
url, session=session)
if set(labels).issubset(set(image_labels)):
images_with_labels.append(image)
# The logic is the following: if one of the labels in
# 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



Loading…
Cancel
Save