openstack
/
instack-undercloud
Code Issues Proposed changes

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.
This commit is contained in:
Ben Nemec 2014-10-27 19:08:51 +00:00
parent a23a242524
commit 208da24237
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imagefactory/dib_deploy_ramdisk_ironic.tdl
View File

@ -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>

2
imagefactory/dib_discovery_ramdisk.tdl
View File

@ -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>

2
imagefactory/dib_overcloud_cinder_volume.tdl
View File

@ -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>

2
imagefactory/dib_overcloud_compute.tdl
View File

@ -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>

2
imagefactory/dib_overcloud_control.tdl
View File

@ -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>

2
imagefactory/dib_overcloud_swift_storage.tdl
View File

@ -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>