X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=apex.git;a=blobdiff_plain;f=lib%2Fansible%2Fplaybooks%2Fprepare_overcloud_containers.yml;fp=lib%2Fansible%2Fplaybooks%2Fprepare_overcloud_containers.yml;h=db1bff89ea9fc51a1839215c00b35d9142576804;hp=e2a4e134adef5053cda8f2768a0b4da23b4e0b15;hb=e1d286e89e04577bda2569a5909dfe8182d953ba;hpb=32b3b5dd6290ae5c33edee2860a3edd9f3044d43

diff --git a/lib/ansible/playbooks/prepare_overcloud_containers.yml b/lib/ansible/playbooks/prepare_overcloud_containers.yml
index e2a4e134..db1bff89 100644
--- a/lib/ansible/playbooks/prepare_overcloud_containers.yml
+++ b/lib/ansible/playbooks/prepare_overcloud_containers.yml
@@ -28,14 +28,13 @@
         url: http://{{ undercloud_ip }}:8787/v2/_catalog
         body_format: json
       register: response
-    - name: Patch Docker images
-      shell: >
-        cd /home/stack/containers/{{ item }} && docker build
-        -t {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex .
+    - include_tasks: patch_containers.yml
+      with_items: "{{ patched_docker_services }}"
+      loop_control:
+        loop_var: item
       when:
         - patched_docker_services|length > 0
         - item in (response.json)['repositories']|join(" ")
-      with_items: "{{ patched_docker_services }}"
     - name: Push patched docker images to local registry
       shell: docker push {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex
       when:
@@ -45,7 +44,7 @@
     - name: Modify Images with Apex tag
       replace:
         path: "/home/stack/docker-images.yaml"
-        regexp: "(\\s*Docker.*?:.*?centos-binary-{{ item[1] }}):.*"
+        regexp: "(\\s*Docker.*?:.*?centos-binary-{{ item }}):.*"
         replace: '\1:apex'
       with_items: "{{ patched_docker_services }}"
       become: yes