Merge remote-tracking branch 'origin/bugfix/zed/pulp-sync-fix' into HEAD

Author: jovial

etc/kayobe/kolla.yml

@@ -74,6 +74,8 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
 # Default is kolla_base_distro_version_default_map[kolla_base_distro].
 #kolla_base_distro_version:
 
+kolla_base_distro_and_version: "{{ kolla_base_distro }}-{{ kolla_base_distro_version }}"
+
 # URL of docker registry to use for Kolla images. Default is not set, in which
 # case Quay.io will be used.
 #kolla_docker_registry:

etc/kayobe/pulp.yml

@@ -549,7 +549,7 @@ stackhpc_pulp_repository_container_repos_kolla_common:
 stackhpc_pulp_repository_container_repos_kolla: >-
   {%- set repos = [] -%}
   {%- 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 repo = {"name": image_repo} -%}
   {%- set _ = repos.append(stackhpc_pulp_repository_container_repos_kolla_common | combine(repo)) -%}