Skip to content

Commit 46d126d

Browse files
committed
Another fixup
``` TASK [Query images and tags] *************************************************** Friday 02 February 2024 20:39:16 +0000 (0:00:01.453) 0:00:01.529 ******* fatal: [localhost]: FAILED! => changed=false cmd: - /stack/kayobe-automation-env/src/kayobe-config/etc/kayobe/../../tools/kolla-images.py - list-tags delta: '0:00:00.324461' end: '2024-02-02 20:39:17.748038' msg: non-zero return code rc: 1 start: '2024-02-02 20:39:17.423577' stderr: |- Traceback (most recent call last): File "/stack/kayobe-automation-env/src/kayobe-config/etc/kayobe/../../tools/kolla-images.py", line 372, in <module> main() File "/stack/kayobe-automation-env/src/kayobe-config/etc/kayobe/../../tools/kolla-images.py", line 364, in main list_tags(base_distros, kolla_image_tags) File "/stack/kayobe-automation-env/src/kayobe-config/etc/kayobe/../../tools/kolla-images.py", line 328, in list_tags image_tags = get_tags(base_distros, kolla_image_tags) File "/stack/kayobe-automation-env/src/kayobe-config/etc/kayobe/../../tools/kolla-images.py", line 199, in get_tags tag = get_tag(kolla_image_tags, base_distro, container) File "/stack/kayobe-automation-env/src/kayobe-config/etc/kayobe/../../tools/kolla-images.py", line 187, in get_tag return get_parent_tag(kolla_image_tags, base_distro, container) File "/stack/kayobe-automation-env/src/kayobe-config/etc/kayobe/../../tools/kolla-images.py", line 178, in get_parent_tag return kolla_image_tags[parent_tag_name][base_distro] KeyError: 'rocky-9' stderr_lines: <omitted> stdout: '' stdout_lines: <omitted> ```
1 parent e7a23b7 commit 46d126d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tools/kolla-images.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def get_parent_tag_name(kolla_image_tags: KollaImageTags, base_distro: Optional[
152152

153153
if container in CONTAINER_TO_PREFIX_VAR_EXCEPTIONS:
154154
prefix_var = CONTAINER_TO_PREFIX_VAR_EXCEPTIONS[container]
155-
if prefix_var in kolla_image_tags:
155+
if prefix_var in kolla_image_tags and (base_distro is None or base_distro in kolla_image_tags[prefix_var]):
156156
return prefix_var
157157
else:
158158
prefix_var = container

0 commit comments

Comments
 (0)