Skip to content

Commit 286bf05

Browse files
authored
Merge pull request #1560 from stackhpc/pulp-include-tags
feat: use `include_tags` for kolla repositories
2 parents edd48d5 + 080d88a commit 286bf05

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

etc/kayobe/pulp.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,11 @@ stackhpc_pulp_repository_container_repos_kolla_common:
582582
# List of Kolla container image repositories.
583583
stackhpc_pulp_repository_container_repos_kolla: >-
584584
{%- set repos = [] -%}
585+
{%- set image_tags = lookup('pipe', 'python3 ' ~ kayobe_config_path ~ '/../../tools/kolla-images.py list-tags') | from_yaml -%}
585586
{%- for image in stackhpc_pulp_images_kolla_filtered -%}
586-
{%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro_and_version]-%}
587+
{%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro_and_version] -%}
587588
{%- set image_repo = kolla_docker_namespace ~ "/" ~ image -%}
588-
{%- set repo = {"name": image_repo} -%}
589+
{%- set repo = {"name": image_repo, "include_tags": image_tags[image]} -%}
589590
{%- set _ = repos.append(stackhpc_pulp_repository_container_repos_kolla_common | combine(repo)) -%}
590591
{%- endif -%}
591592
{%- endfor -%}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
features:
3+
- |
4+
Restrict the content that is synced to the client by using include tags.
5+
This feature ensures that the tags as defined within
6+
``kolla-image-tags.yml`` are synced.

0 commit comments

Comments
 (0)