openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Add tcib_managed label only for train release onwards 

tcib_managed label is used for new ubi-8 container workflow and
used during tripleo container prepare step to update the containers
since tcib_managed label is not available before train release so
containers are not getted re-tagged with modify_append_tag and leading
to tempest containers not found.

Making tcib_managed label conditional fixes the issue.

It also needs to be tweaked for standalone.

Closes-Bug: #1891372

Change-Id: I6a80d4e3a3b2692a57062af6c76028998482d106
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
This commit is contained in:
Chandan Kumar (raukadah) 2020-08-19 16:56:02 +05:30
parent 593d4942f1
commit 09acb542b3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,8 +212,12 @@
{% 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 %}
{% endif %}
{% set _ = item.__setitem__(
"modify_vars",
{

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

@ -11,7 +11,9 @@ parameter_defaults:
modify_append_tag: "{{ update_containers_append_tag }}"
modify_only_with_labels:
- kolla_version
{% if release not in ['queens', 'rocky', 'stein']%}
- tcib_managed
{% endif %}
modify_vars:
tasks_from: yum_update.yml
yum_repos_dir_path: /etc/yum.repos.d