From 83b4aa3092f560e3cdaf119167fdcdebc2e44b45 Mon Sep 17 00:00:00 2001 From: Javier Pena Date: Fri, 2 Jun 2017 15:42:27 +0200 Subject: [PATCH] Use qcow2 as disk format for ami images According to [1], 'ami' is a valid disk format for Glance images. However, after [2] we are failing to boot from volume on AMI images because qemu-img convert does not recognize it as a valid disk format. The image is really qcow2, so let's use it as a workaround (see [3] for the bug description). [1] - https://docs.openstack.org/developer/glance/formats.html [2] - https://review.openstack.org/453341 [3] - https://bugs.launchpad.net/cinder/+bug/1693926 Change-Id: I2dbf4736ebe4cda776fc51de62af462b800f918b --- .../modules/packstack/manifests/provision/glance.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/provision/glance.pp b/packstack/puppet/modules/packstack/manifests/provision/glance.pp index 6238654a2..0e0ee488e 100644 --- a/packstack/puppet/modules/packstack/manifests/provision/glance.pp +++ b/packstack/puppet/modules/packstack/manifests/provision/glance.pp @@ -41,7 +41,7 @@ class packstack::provision::glance () ensure => present, is_public => 'yes', container_format => 'ami', - disk_format => 'ami', + disk_format => 'qcow2', source => $uec_image_source_disk, properties => { 'kernel_id' => '146d4a6b-ad1e-4d9f-8b08-98eae3c3dab4', 'ramdisk_id' => '0b50e2e5-1440-4654-b568-4e120ddf28c1' }, require => [ Glance_image["${uec_image_name}-kernel"], Glance_image["${uec_image_name}-ramdisk"] ] @@ -51,7 +51,11 @@ class packstack::provision::glance () ensure => present, is_public => 'yes', container_format => 'ami', - disk_format => 'ami', + # FIXME(jpena): ami used to be an acceptable disk format, but we are + # failing to boot from volume since https://review.openstack.org/453341 + # because qemu-img convert does not recognize is as a valid format. + # See https://bugs.launchpad.net/cinder/+bug/1693926 + disk_format => 'qcow2', source => $uec_image_source_disk, properties => { 'kernel_id' => '146d4a6b-ad1e-4d9f-8b08-98eae3c3dab4', 'ramdisk_id' => '0b50e2e5-1440-4654-b568-4e120ddf28c1' }, require => [ Glance_image["${uec_image_name}-kernel"], Glance_image["${uec_image_name}-ramdisk"] ]