Inject gating repo in overcloud-full image as well

For some packages (puppet modules), we need to inject
them in both the undercloud and overcloud. This patch
handles the overcloud case, by first extracting the
overcloud-full image. Then, injecting the gating repo,
and finally, putting the updated image back on to
the undercloud.

Partial-Bug: 1572958
Change-Id: I2fc326b640d7f6020c27d2040f6328192cf890f3

roles/libvirt/setup/undercloud/tasks/inject_gating_repo.yml

@@ -4,11 +4,31 @@
     src: inject_gating_repo.sh.j2
     dest: "{{ working_dir }}/inject_gating_repo.sh"
 
-- name: Inject the gating repo
-  command: >
-    virt-customize -a {{ working_dir }}/undercloud.qcow2
-    --upload {{ compressed_gating_repo }}:/tmp/gating_repo.tar.gz
-    --run '{{ working_dir }}/inject_gating_repo.sh'
+
+- block:
+  # We need to extract the overcloud image, so we can inject the gating
+  # repo into it.
+  - name: Extract overcloud-full image
+    command: >
+      virt-copy-out -a {{ working_dir }}/undercloud.qcow2
+      /home/stack/overcloud-full.qcow2 {{ working_dir }}
+
+  - name: Inject the gating repo (overcloud-full)
+    command: >
+      virt-customize -a {{ working_dir }}/overcloud-full.qcow2
+      --upload {{ compressed_gating_repo }}:/tmp/gating_repo.tar.gz
+      --run '{{ working_dir }}/inject_gating_repo.sh'
+
+  - name: Copy updated overcloud-full image back to undercloud
+    command: >
+      virt-copy-in -a {{ working_dir }}/undercloud.qcow2
+      {{ working_dir }}/overcloud-full.qcow2 /home/stack/
+
+  - name: Inject the gating repo (undercloud)
+    command: >
+      virt-customize -a {{ working_dir }}/undercloud.qcow2
+      --upload {{ compressed_gating_repo }}:/tmp/gating_repo.tar.gz
+      --run '{{ working_dir }}/inject_gating_repo.sh'
   environment:
     LIBGUESTFS_BACKEND: direct
     LIBVIRT_DEFAULT_URI: "{{ libvirt_uri }}"