Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Skip all non-kolla based images in containers-prepare-parameter.yaml
Browse files Browse the repository at this point in the history
We're introducing a filter based on container image labels for the
tripleo-modify-image role that lets us skip non-kolla based images.
The remaining images are all good potential candidates for the update.

There is no need to maintain a list of excluded images anymore or to
push to the local registry in two separate steps.

Depends-On: Ie7f628bb54c83c78e810320c739afff158234804
Change-Id: Icad8918a7359a863b746b0bf9c2f2597a5c71bf8
  • Loading branch information
mandre authored and EmilienM committed Jul 18, 2018
1 parent e2b45f6 commit fcfba66
Showing 1 changed file with 2 additions and 10 deletions.
Expand Up @@ -3,13 +3,11 @@ parameter_defaults:
- {{ local_docker_registry_host }}:8787
ContainerImagePrepare:
- push_destination: "{{ local_docker_registry_host }}:8787"
excludes:
- ceph
- openshift
- kubernetes
{% if update_containers|bool and not use_overcloud_mixed_upgrade|default(false)|bool %}
modify_role: tripleo-modify-image
modify_append_tag: "{{ update_containers_append_tag }}"
modify_only_with_labels:
- kolla_version
modify_vars:
tasks_from: yum_update.yml
compare_host_packages: true
Expand All @@ -21,12 +19,6 @@ parameter_defaults:
namespace: "{{ docker_registry_host }}/{{ docker_registry_namespace_used }}"
name_prefix: "{{ docker_prep_prefix }}"
name_suffix: "{{ docker_prep_suffix }}"
- push_destination: "{{ local_docker_registry_host }}:8787"
includes:
- ceph
- openshift
- kubernetes
set:
ceph_namespace: "{{ docker_ceph_namespace }}"
ceph_image: "{{ docker_ceph_image }}"
ceph_tag: "{{ docker_ceph_tag }}"
Expand Down

0 comments on commit fcfba66

Please sign in to comment.