Skip to content

Fix issue with pulp sync #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 5, 2024
Merged

Fix issue with pulp sync #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62b9e2b
Fix issue with pulp sync
jovial Feb 2, 2024
7e44433
Update other variable
jovial Feb 2, 2024
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
2 changes: 2 additions & 0 deletions etc/kayobe/kolla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
# Default is kolla_base_distro_version_default_map[kolla_base_distro].
#kolla_base_distro_version:

kolla_base_distro_and_version: "{{ kolla_base_distro }}-{{ kolla_base_distro_version }}"

# URL of docker registry to use for Kolla images. Default is not set, in which
# case Quay.io will be used.
#kolla_docker_registry:
Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/pulp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ stackhpc_pulp_repository_container_repos_kolla_common:
stackhpc_pulp_repository_container_repos_kolla: >-
{%- set repos = [] -%}
{%- for image in stackhpc_pulp_images_kolla_filtered -%}
{%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro]-%}
{%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro_and_version]-%}
{%- set image_repo = kolla_docker_namespace ~ "/" ~ image -%}
{%- set repo = {"name": image_repo} -%}
{%- set _ = repos.append(stackhpc_pulp_repository_container_repos_kolla_common | combine(repo)) -%}
Expand All @@ -565,7 +565,7 @@ stackhpc_pulp_distribution_container_kolla_common:
stackhpc_pulp_distribution_container_kolla: >-
{%- set distributions = [] -%}
{%- for image in stackhpc_pulp_images_kolla_filtered -%}
{%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro]-%}
{%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro_and_version]-%}
{%- set image_repo = kolla_docker_namespace ~ "/" ~ 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