Skip to content

Commit f642fd5

Browse files
authored
Fix kolla-images.py for latest Kolla Ansible (#1521)
Kolla image names have recently been updated to include a prefix, docker_image_name_prefix. This change updates the kolla-images.py script to compensate.
2 parents 97768a2 + 1242ae2 commit f642fd5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/kolla-images.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ def validate(kolla_image_tags: KollaImageTags):
242242
tag_var_re = re.compile(r"^[a-z0-9_]+$")
243243
openstack_release = get_openstack_release()
244244
tag_res = {
245-
base_distro: re.compile(f"^{openstack_release}-{base_distro}-[\d]{{8}}T[\d]{{6}}$")
245+
base_distro: re.compile(rf"^{openstack_release}-{base_distro}-[\d]{{8}}T[\d]{{6}}$")
246246
for base_distro in SUPPORTED_BASE_DISTROS
247247
}
248248
errors = []
@@ -310,7 +310,7 @@ def check_image_map(kolla_ansible_path: str):
310310
image_map = yaml.safe_load(image_map_str)
311311
image_var_re = re.compile(r"^([a-z0-9_]+)_image$")
312312
image_map = {
313-
image_var_re.match(image_var).group(1): image.split("/")[-1]
313+
image_var_re.match(image_var).group(1): image.split("/")[-1].replace('{{ docker_image_name_prefix }}', '')
314314
for image_var, image in image_map.items()
315315
}
316316
# Filter out unsupported images.

0 commit comments

Comments
 (0)