openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Use new modify_only_with_source 

The modify_only_with_labels has to query the container registry in order
to do updates. In the upstream CI we want to limit the containers that
are to be updated to only if the image_source is 'kolla' or 'tripleo'.

Change-Id: I9ac9ef61097443a00b39710f122bf147d4012e4c
Depends-On: https://review.opendev.org/#/c/746990
Depends-On: https://review.opendev.org/#/c/747721
Depends-On: https://review.opendev.org/#/c/747720
Related-Bug: #1889122
This commit is contained in:
Alex Schultz 2020-08-19 10:36:47 -06:00
parent 1728c577e2
commit 161099faa3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roles/standalone/tasks/main.yml
View File

@ -212,11 +212,11 @@
{% set _ = item.__setitem__("modify_role", "tripleo-modify-image") %}
{% set _ = item.__setitem__("modify_append_tag", update_containers_append_tag) %}
{% if not (osp_release is defined) %}
{% if release in ['queens', 'rocky', 'stein'] %}
{% set _ = item.__setitem__("modify_only_with_labels", ["kolla_version"]) %}
{% else %}
{% set _ = item.__setitem__("modify_only_with_labels", ["kolla_version", "tcib_managed"]) %}
{% endif %}
{% if release in ['rocky', 'stein'] %}
{% set _ = item.__setitem__("modify_only_with_labels", ["kolla_version"]) %}
{% else %}
{% set _ = item.__setitem__("modify_only_with_source", ["kolla", "tripleo"]) %}
{% endif %}
{% endif %}
{% set _ = item.__setitem__(
"modify_vars",

6
roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
View File

@ -9,10 +9,14 @@ parameter_defaults:
{% 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 }}"
{% if release in ['rocky', 'stein'] %}
modify_only_with_labels:
- kolla_version
{% if release not in ['queens', 'rocky', 'stein']%}
- tcib_managed
{% else %}
modify_only_with_source:
- kolla
- tripleo
{% endif %}
modify_vars:
tasks_from: yum_update.yml