Skip to content

Commit 4b0dc54

Browse files
committed
Support synchronising custom container images
A custom list of container images can be synced to the local Pulp using the stackhpc_pulp_repository_container_repos_extra and stackhpc_pulp_distribution_container_extra variables.
1 parent 6c46bce commit 4b0dc54

File tree

3 files changed

+43
-2
lines changed

3 files changed

+43
-2
lines changed

doc/source/configuration/release-train.rst

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,33 @@ By default, HashiCorp images (Consul and Vault) are not synced from Docker Hub
153153
to the local Pulp. To sync these images, set ``stackhpc_sync_hashicorp_images``
154154
to ``true``.
155155

156+
Custom container images
157+
-----------------------
158+
159+
A custom list of container images can be synced to the local Pulp using the
160+
``stackhpc_pulp_repository_container_repos_extra`` and
161+
``stackhpc_pulp_distribution_container_extra`` variables.
162+
163+
.. code-block:: yaml
164+
165+
# List of extra container image repositories.
166+
stackhpc_pulp_repository_container_repos_extra:
167+
- name: "certbot/certbot"
168+
url: "https://registry-1.docker.io"
169+
policy: on_demand
170+
proxy_url: "{{ pulp_proxy_url }}"
171+
state: present
172+
include_tags: "nightly"
173+
required: True
174+
175+
# List of extra container image distributions.
176+
stackhpc_pulp_distribution_container_extra:
177+
- name: certbot
178+
repository: certbot/certbot
179+
base_path: certbot/certbot
180+
state: present
181+
required: True
182+
156183
Usage
157184
=====
158185

etc/kayobe/pulp.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,14 +821,22 @@ stackhpc_pulp_distribution_container_hashicorp:
821821
state: present
822822
required: "{{ stackhpc_sync_hashicorp_images | bool }}"
823823

824+
# List of extra container image repositories.
825+
stackhpc_pulp_repository_container_repos_extra: []
826+
827+
# List of extra container image distributions.
828+
stackhpc_pulp_distribution_container_extra: []
829+
824830
# List of container image repositories.
825831
stackhpc_pulp_repository_container_repos: >-
826832
{{ (stackhpc_pulp_repository_container_repos_kolla +
827833
stackhpc_pulp_repository_container_repos_ceph +
828-
stackhpc_pulp_repository_container_repos_hashicorp) | selectattr('required') }}
834+
stackhpc_pulp_repository_container_repos_hashicorp +
835+
stackhpc_pulp_repository_container_repos_extra) | selectattr('required') }}
829836
830837
# List of container image distributions.
831838
stackhpc_pulp_distribution_container: >-
832839
{{ (stackhpc_pulp_distribution_container_kolla +
833840
stackhpc_pulp_distribution_container_ceph +
834-
stackhpc_pulp_distribution_container_hashicorp) | selectattr('required') }}
841+
stackhpc_pulp_distribution_container_hashicorp +
842+
stackhpc_pulp_distribution_container_extra) | selectattr('required') }}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
features:
3+
- |
4+
Allows to synchronise a custom list of containers to Pulp using the
5+
``stackhpc_pulp_repository_container_repos_extra`` and
6+
``stackhpc_pulp_distribution_container_extra`` variables.

0 commit comments

Comments
 (0)