Merge remote-tracking branch 'origin/sync/zed-into-2023.1' into HEAD

Author: jovial

.automation

@@ -10,7 +10,7 @@ kolla_image_tags:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20231228T140806
   cloudkitty:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20231115T110235
-  haproxy-ssh:
+  haproxy_ssh:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240104T071640
   letsencrypt:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240104T071640

etc/kayobe/kolla-image-tags.yml

@@ -566,7 +566,7 @@ stackhpc_pulp_distribution_container_kolla_common:
 stackhpc_pulp_distribution_container_kolla: >-
   {%- set distributions = [] -%}
   {%- for image in stackhpc_pulp_images_kolla_filtered -%}
-  {%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro]-%}
+  {%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro_and_version]-%}
   {%- set image_repo = kolla_docker_namespace ~ "/" ~ image -%}
   {%- set distribution = {"name": image_repo, "repository": image_repo, "base_path": image_repo} -%}
   {%- set _ = distributions.append(stackhpc_pulp_distribution_container_kolla_common | combine(distribution)) -%}

etc/kayobe/pulp.yml

@@ -152,7 +152,7 @@ def get_parent_tag_name(kolla_image_tags: KollaImageTags, base_distro: Optional[
 
     if container in CONTAINER_TO_PREFIX_VAR_EXCEPTIONS:
         prefix_var = CONTAINER_TO_PREFIX_VAR_EXCEPTIONS[container]
-        if prefix_var in kolla_image_tags:
+        if prefix_var in kolla_image_tags and (base_distro is None or base_distro in kolla_image_tags[prefix_var]):
             return prefix_var
     else:
         prefix_var = container
@@ -221,7 +221,7 @@ def get_openstack_release() -> str:
 
 def validate(kolla_image_tags: KollaImageTags):
     """Validate the kolla_image_tags variable."""
-    tag_var_re = re.compile(r"^[a-z0-9_-]+$")
+    tag_var_re = re.compile(r"^[a-z0-9_]+$")
     openstack_release = get_openstack_release()
     tag_res = {
         base_distro: re.compile(f"^{openstack_release}-{base_distro}-[\d]{{8}}T[\d]{{6}}$")