4 files changed, 16 insertions, 1 deletions
diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml
index ed4888414..38eae184c 100644
--- a/roles/kolla-build-config/defaults/main.yml
+++ b/roles/kolla-build-config/defaults/main.yml
@@ -35,7 +35,6 @@ kolla_build_sources:
   openstack/neutron-dynamic-routing:
     - neutron-bgp-dragent
     - neutron-server-plugin-neutron-dynamic-routing
-  openstack/networking-infoblox: neutron-server-plugin-networking-infoblox
   openstack/networking-generic-switch: neutron-base-plugin-networking-generic-switch
   openstack/networking-sfc:
     - neutron-base-plugin-networking-sfc
diff --git a/roles/kolla-build-deps/tasks/main.yml b/roles/kolla-build-deps/tasks/main.yml
index 490f13edf..399aa4380 100644
--- a/roles/kolla-build-deps/tasks/main.yml
+++ b/roles/kolla-build-deps/tasks/main.yml
@@ -51,6 +51,12 @@
   ansible.builtin.include_role:
     name: "{{ container_engine }}_sdk"
 
+- name: Install docker-buildx-plugin
+  ansible.builtin.package:
+    name: docker-buildx-plugin
+  become: true
+  when: container_engine == 'docker'
+
 - name: Ensure container engine socket is world-writable
   ansible.builtin.file:
     path: "{{ '/run/docker.sock' if container_engine == 'docker' else '/run/podman/podman.sock' }}"
diff --git a/roles/kolla-build/defaults/main.yml b/roles/kolla-build/defaults/main.yml
index fe7c33a33..98051c97b 100644
--- a/roles/kolla-build/defaults/main.yml
+++ b/roles/kolla-build/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
 kolla_build_logs_dir: "{{ zuul_output_dir }}/logs/kolla/build"
+kolla_build_repos_yaml_path: ""
 kolla_build_template_overrides_path: ""
 kolla_build_venv_path: "/tmp/kolla-virtualenv"
diff --git a/roles/kolla-build/tasks/main.yml b/roles/kolla-build/tasks/main.yml
index e5529f381..927bb1309 100644
--- a/roles/kolla-build/tasks/main.yml
+++ b/roles/kolla-build/tasks/main.yml
@@ -1,4 +1,13 @@
 ---
+- name: Template repos.yaml
+  ansible.builtin.template:
+    src: "{{ kolla_build_repos_yaml_path }}"
+    dest: /etc/kolla/repos.yaml
+    mode: "0660"
+    owner: zuul
+    group: zuul
+  when: kolla_build_repos_yaml_path | length > 0
+
 - name: Template template_overrides.j2
   ansible.builtin.template:
     src: "{{ kolla_build_template_overrides_path }}"