@@ -161,7 +161,7 @@ stackhpc_pulp_distribution_rpm_production:
161
161
stackhpc_release_pulp_registry_url : " {{ stackhpc_release_pulp_url }}"
162
162
163
163
# List of all image names.
164
- stackhpc_pulp_images :
164
+ stackhpc_pulp_images_kolla :
165
165
- barbican-api
166
166
- barbican-base
167
167
- barbican-keystone-listener
@@ -282,33 +282,64 @@ stackhpc_pulp_images:
282
282
- redis-sentinel
283
283
284
284
# Common parameters for container image repositories.
285
- stackhpc_pulp_repository_container_repos_common :
285
+ stackhpc_pulp_repository_container_repos_kolla_common :
286
286
url : " {{ stackhpc_release_pulp_registry_url }}"
287
287
policy : on_demand
288
288
remote_username : " {{ stackhpc_release_pulp_username }}"
289
289
remote_password : " {{ stackhpc_release_pulp_password }}"
290
290
state : present
291
+ required : true
291
292
292
- # List of container image repositories.
293
- stackhpc_pulp_repository_container_repos : >-
293
+ # List of Kolla container image repositories.
294
+ stackhpc_pulp_repository_container_repos_kolla : >-
294
295
{%- set repos = [] -%}
295
- {%- for image in stackhpc_pulp_images -%}
296
+ {%- for image in stackhpc_pulp_images_kolla -%}
296
297
{%- set image_repo = kolla_docker_namespace ~ "/" ~ kolla_base_distro ~ "-" ~ kolla_install_type ~ "-" ~ image -%}
297
298
{%- set repo = {"name": image_repo} -%}
298
- {%- set _ = repos.append(stackhpc_pulp_repository_container_repos_common | combine(repo)) -%}
299
+ {%- set _ = repos.append(stackhpc_pulp_repository_container_repos_kolla_common | combine(repo)) -%}
299
300
{%- endfor -%}
300
301
{{ repos }}
301
302
302
- # Common parameters for container image distributions.
303
- stackhpc_pulp_distribution_container_common :
303
+ # Common parameters for Kolla container image distributions.
304
+ stackhpc_pulp_distribution_container_kolla_common :
304
305
state : present
306
+ required : true
305
307
306
- # List of container image distributions.
307
- stackhpc_pulp_distribution_container : >-
308
+ # List of Kolla container image distributions.
309
+ stackhpc_pulp_distribution_container_kolla : >-
308
310
{%- set distributions = [] -%}
309
- {%- for image in stackhpc_pulp_images -%}
311
+ {%- for image in stackhpc_pulp_images_kolla -%}
310
312
{%- set image_repo = kolla_docker_namespace ~ "/" ~ kolla_base_distro ~ "-" ~ kolla_install_type ~ "-" ~ image -%}
311
313
{%- set distribution = {"name": image_repo, "repository": image_repo, "base_path": image_repo} -%}
312
- {%- set _ = distributions.append(stackhpc_pulp_distribution_container_common | combine(distribution)) -%}
314
+ {%- set _ = distributions.append(stackhpc_pulp_distribution_container_kolla_common | combine(distribution)) -%}
313
315
{%- endfor -%}
314
316
{{ distributions }}
317
+
318
+ # Whether to sync Ceph container images.
319
+ stackhpc_sync_ceph_images : false
320
+
321
+ # List of Ceph container image repositories.
322
+ stackhpc_pulp_repository_container_repos_ceph :
323
+ - name : " ceph/ceph"
324
+ url : " https://quay.io"
325
+ policy : on_demand
326
+ state : present
327
+ required : " {{ stackhpc_sync_ceph_images | bool }}"
328
+
329
+ # List of Ceph container image distributions.
330
+ stackhpc_pulp_distribution_container_ceph :
331
+ - name : ceph
332
+ repository : ceph/ceph
333
+ base_path : ceph/ceph
334
+ state : present
335
+ required : " {{ stackhpc_sync_ceph_images | bool }}"
336
+
337
+ # List of container image repositories.
338
+ stackhpc_pulp_repository_container_repos : >-
339
+ {{ (stackhpc_pulp_repository_container_repos_kolla +
340
+ stackhpc_pulp_repository_container_repos_ceph) | selectattr('required') }}
341
+
342
+ # List of container image distributions.
343
+ stackhpc_pulp_distribution_container : >-
344
+ {{ (stackhpc_pulp_distribution_container_kolla +
345
+ stackhpc_pulp_distribution_container_ceph) | selectattr('required') }}
0 commit comments