From 208da24237cfcaf8a4704402705fbc45ef5d2838 Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Mon, 27 Oct 2014 19:08:51 +0000
Subject: [PATCH] Don't specify the input type to qemu-img

At least in Koji, raw isn't correct and qemu-img will figure out
the correct file type automatically if it's just omitted.
---
 imagefactory/dib_deploy_ramdisk_ironic.tdl   | 2 +-
 imagefactory/dib_discovery_ramdisk.tdl       | 2 +-
 imagefactory/dib_overcloud_cinder_volume.tdl | 2 +-
 imagefactory/dib_overcloud_compute.tdl       | 2 +-
 imagefactory/dib_overcloud_control.tdl       | 2 +-
 imagefactory/dib_overcloud_swift_storage.tdl | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/imagefactory/dib_deploy_ramdisk_ironic.tdl b/imagefactory/dib_deploy_ramdisk_ironic.tdl
index a7cd2f453..35588cebf 100644
--- a/imagefactory/dib_deploy_ramdisk_ironic.tdl
+++ b/imagefactory/dib_deploy_ramdisk_ironic.tdl
@@ -3,7 +3,7 @@
    <command name='mount'>mount /dev/vdb1 /mnt</command>
    <command name='backup'>cp /etc/sudoers /etc/sudoers_backup</command>
    <command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
-   <command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
+   <command name='convert'>qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
    <command name="localimage">export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
 instack-build-images deploy-ramdisk
 </command>
diff --git a/imagefactory/dib_discovery_ramdisk.tdl b/imagefactory/dib_discovery_ramdisk.tdl
index d16d81188..76fc45383 100644
--- a/imagefactory/dib_discovery_ramdisk.tdl
+++ b/imagefactory/dib_discovery_ramdisk.tdl
@@ -3,7 +3,7 @@
    <command name='mount'>mount /dev/vdb1 /mnt</command>
    <command name='backup'>cp /etc/sudoers /etc/sudoers_backup</command>
    <command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
-   <command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
+   <command name='convert'>qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
    <command name="localimage">export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
 instack-build-images discovery-ramdisk
 </command>
diff --git a/imagefactory/dib_overcloud_cinder_volume.tdl b/imagefactory/dib_overcloud_cinder_volume.tdl
index 619500292..5bd62f6bc 100644
--- a/imagefactory/dib_overcloud_cinder_volume.tdl
+++ b/imagefactory/dib_overcloud_cinder_volume.tdl
@@ -3,7 +3,7 @@
    <command name='mount'>mount /dev/vdb1 /mnt</command>
    <command name='backup'>cp /etc/sudoers /etc/sudoers_backup</command>
    <command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
-   <command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
+   <command name='convert'>qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
    <command name="localimage">export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
 instack-build-images overcloud-cinder-volume
 </command>
diff --git a/imagefactory/dib_overcloud_compute.tdl b/imagefactory/dib_overcloud_compute.tdl
index 2370b2ad4..7d6698657 100644
--- a/imagefactory/dib_overcloud_compute.tdl
+++ b/imagefactory/dib_overcloud_compute.tdl
@@ -3,7 +3,7 @@
    <command name='mount'>mount /dev/vdb1 /mnt</command>
    <command name='backup'>cp /etc/sudoers /etc/sudoers_backup</command>
    <command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
-   <command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
+   <command name='convert'>qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
    <command name="localimage">export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
 instack-build-images overcloud-compute
 </command>
diff --git a/imagefactory/dib_overcloud_control.tdl b/imagefactory/dib_overcloud_control.tdl
index 24e848f5b..03126a738 100644
--- a/imagefactory/dib_overcloud_control.tdl
+++ b/imagefactory/dib_overcloud_control.tdl
@@ -3,7 +3,7 @@
    <command name='mount'>mount /dev/vdb1 /mnt</command>
    <command name='backup'>cp /etc/sudoers /etc/sudoers_backup</command>
    <command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
-   <command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
+   <command name='convert'>qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
    <command name="localimage">export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
 instack-build-images overcloud-control
 </command>
diff --git a/imagefactory/dib_overcloud_swift_storage.tdl b/imagefactory/dib_overcloud_swift_storage.tdl
index 29375d99d..2596bb2e6 100644
--- a/imagefactory/dib_overcloud_swift_storage.tdl
+++ b/imagefactory/dib_overcloud_swift_storage.tdl
@@ -3,7 +3,7 @@
    <command name='mount'>mount /dev/vdb1 /mnt</command>
    <command name='backup'>cp /etc/sudoers /etc/sudoers_backup</command>
    <command name='pty'>sed 's/.*requiretty//g' /etc/sudoers_backup > /etc/sudoers</command>
-   <command name='convert'>qemu-img convert -f raw -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
+   <command name='convert'>qemu-img convert -O qcow2 /mnt/input_image.raw /mnt/input_image.qcow2</command>
    <command name="localimage">export DIB_LOCAL_IMAGE=/mnt/input_image.qcow2
 instack-build-images overcloud-swift-storage
 </command>