Skip to content

Commit a9bd432

Browse files
committed
Fix kolla-images.py for latest Kolla Ansible
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.
1 parent 46ecb0a commit a9bd432

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
@@ -240,7 +240,7 @@ def validate(kolla_image_tags: KollaImageTags):
240240
tag_var_re = re.compile(r"^[a-z0-9_]+$")
241241
openstack_release = get_openstack_release()
242242
tag_res = {
243-
base_distro: re.compile(f"^{openstack_release}-{base_distro}-[\d]{{8}}T[\d]{{6}}$")
243+
base_distro: re.compile(rf"^{openstack_release}-{base_distro}-[\d]{{8}}T[\d]{{6}}$")
244244
for base_distro in SUPPORTED_BASE_DISTROS
245245
}
246246
errors = []
@@ -308,7 +308,7 @@ def check_image_map(kolla_ansible_path: str):
308308
image_map = yaml.safe_load(image_map_str)
309309
image_var_re = re.compile(r"^([a-z0-9_]+)_image$")
310310
image_map = {
311-
image_var_re.match(image_var).group(1): image.split("/")[-1]
311+
image_var_re.match(image_var).group(1): image.split("/")[-1].replace('{{ docker_image_name_prefix }}','')
312312
for image_var, image in image_map.items()
313313
}
314314
# Filter out unsupported images.

0 commit comments

Comments
 (0)