Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions etc/kayobe/pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,15 @@ stackhpc_pulp_images_kolla:
- redis-base
- redis-sentinel

# Whitespace-separated list of regular expressions matching Kolla image names.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

White space separated matches what we have in https://github.com/stackhpc/stackhpc-release-train/pull/121/files. Not related to this PR, as none of the image names contain anyway whitespace, but I had the sudden realisation that this means that the short names for the repositories can't have any whitespace in.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct.

# Usage is similar to kolla-build CLI arguments.
# Example:
# kayobe playbook run ... -e stackhpc_pulp_images_kolla_filter='"^glance nova-compute$"'
stackhpc_pulp_images_kolla_filter: ".*"

# Filtered list of Kolla container image names.
stackhpc_pulp_images_kolla_filtered: "{{ stackhpc_pulp_images_kolla | select('search', '(' ~ stackhpc_pulp_images_kolla_filter.split() | join('|') ~ ')') | list }}"

# Common parameters for container image repositories.
stackhpc_pulp_repository_container_repos_kolla_common:
url: "{{ stackhpc_release_pulp_registry_url }}"
Expand All @@ -440,7 +449,7 @@ stackhpc_pulp_repository_container_repos_kolla_common:
# List of Kolla container image repositories.
stackhpc_pulp_repository_container_repos_kolla: >-
{%- set repos = [] -%}
{%- for image in stackhpc_pulp_images_kolla -%}
{%- for image in stackhpc_pulp_images_kolla_filtered -%}
{%- set image_repo = kolla_docker_namespace ~ "/" ~ kolla_base_distro ~ "-" ~ kolla_install_type ~ "-" ~ image -%}
{%- set repo = {"name": image_repo} -%}
{%- set _ = repos.append(stackhpc_pulp_repository_container_repos_kolla_common | combine(repo)) -%}
Expand All @@ -455,7 +464,7 @@ stackhpc_pulp_distribution_container_kolla_common:
# List of Kolla container image distributions.
stackhpc_pulp_distribution_container_kolla: >-
{%- set distributions = [] -%}
{%- for image in stackhpc_pulp_images_kolla -%}
{%- for image in stackhpc_pulp_images_kolla_filtered -%}
{%- set image_repo = kolla_docker_namespace ~ "/" ~ kolla_base_distro ~ "-" ~ kolla_install_type ~ "-" ~ image -%}
{%- set distribution = {"name": image_repo, "repository": image_repo, "base_path": image_repo} -%}
{%- set _ = distributions.append(stackhpc_pulp_distribution_container_kolla_common | combine(distribution)) -%}
Expand Down