Allow disk image format to be specified

This patch set changes the default image
format type from a hard-coded value of 'qcow2'
to the variable ``cirros_img_disk_format``.

This will allow alternate image types to be
specified during automated testing.

Change-Id: I5d87917196d1153310b25390da397cd96002174f
Needed-By: Ib49312dcb8fb5bd553369819cfd551137ff1c19e

defaults/main.yml

@@ -155,6 +155,7 @@ tempest_pip_packages:
 cirros_version: 0.3.4
 cirros_tgz_url: "http://download.cirros-cloud.net/{{ cirros_version }}/cirros-{{ cirros_version }}-x86_64-uec.tar.gz"
 cirros_img_url: "{{ cirros_tgz_url|replace('uec.tar.gz','disk.img') }}"
+cirros_img_disk_format: qcow2
 
 tempest_image_dir: "/opt/images"
 tempest_images:

releasenotes/notes/add-disk-image-type-932898aca944f14a.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - Added new parameter ```cirros_img_disk_format``
+    to support disk formats other than qcow2.

tasks/tempest_resources.yml

@@ -20,7 +20,7 @@
     image_name: cirros
     image_url: "{{ cirros_img_url }}"
     image_container_format: bare
-    image_disk_format: qcow2
+    image_disk_format: "{{ cirros_img_disk_format }"
     image_is_public: True
     insecure: "{{ keystone_service_internaluri_insecure }}"
   register: cirros_image_create
@@ -57,7 +57,7 @@
     image_name: cirros_alt
     image_url: "{{ cirros_img_url }}"
     image_container_format: bare
-    image_disk_format: qcow2
+    image_disk_format: "{{ cirros_img_disk_format }}"
     image_is_public: True
     insecure: "{{ keystone_service_internaluri_insecure }}"
   when: tempest_service_available_glance | bool