Merge "Add new feature to consume external images"

doc/source/configuration.rst

@@ -156,3 +156,17 @@ var, that needs to point to an script living on your filesystem.
 That script will be copied to working directory, and applied on the
 overcloud. The script can be in Jinja template format, so you can benefit
 from ansible var substitutions.
+
+Consuming external images
+-------------------------
+
+In the usual workflow, tripleo-quickstart relies on the overcloud
+and agent images that are shipped in the undercloud. But for certain
+types of tests, it is useful to provide your own images.
+To achieve that, set the ``use_external_images`` to True. This will
+cause to inject all the images listed in the ``inject_images`` list
+into the undercloud, so the system can use it.
+Please note that you also need to define all the images you want to
+fetch, using the ``images`` setting. You will need to define the name
+of the image, the url where to get it, and the image type (qcow2, tar).
+As a reference, please look at `http://git.openstack.org/cgit/openstack/tripleo-quickstart/tree/config/release/master-tripleo-ci.yml`

roles/libvirt/defaults/main.yml

@@ -36,3 +36,8 @@ libvirt_arch: x86_64
 undercloud_ip_retries: 20
 
 undercloud_instackenv_template: instackenv.json.j2
+
+# set to true if you want to inject additional overcloud
+# and ipa images. You will need to define the images and
+# mapping, and inject_images list as well
+use_external_images: false

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

@@ -66,7 +66,7 @@
       LIBGUESTFS_BACKEND: direct
       LIBVIRT_DEFAULT_URI: "{{ libvirt_uri }}"
     with_items: "{{ inject_images | default('') }}"
-    when: overcloud_as_undercloud|bool
+    when: overcloud_as_undercloud|bool or use_external_images|bool
 
   # This copies the `instackenv.json` configuration file that we
   # generated in the overcloud setup role to the undercloud host.