From ca12251eb36ddf1efc4d6bbed37a6e002ae110c2 Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Tue, 29 Mar 2016 15:06:02 +0200 Subject: Clean up and fix Libvirt and Ceph [ Stanislaw Kardach ] * Fix upload_cirros timeout * Workaround for default video device in nova * Fix syntax and increase TestVM's RAM requirements [ Alexandru Avadanii ] * Cleanup: Obsolete SEPARATE_IMAGES. * Nova libvirt drv: arm64: Update console default. * fuel{,-main}: Cleanup obsolete patches. * nova: Fix inject for direct boot with part table. See https://bugs.launchpad.net/nova/+bug/1290455 for full bug description. For now, we detect direct kernel boot with a partition table inside disk image by passing target_partition when root kernel arg points to a partition (instead of the whole disk). * Drop obsolete/done TODO entries. * Nova: Fix os cmd line parsing for list case. * ceph: Fix obsolete XFS mount param. * Fix out-of-order embedded patch hunks. Signed-off-by: Stanislaw Kardach Signed-off-by: Alexandru Avadanii (cherry picked from commit 0f762e556ea7b2393f56ca7fb8e06f66f99880aa) Change-Id: I24f84e8b100b3f1542f9f51db93ebad9831b9b14 --- patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'patches/fuel-web') diff --git a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch index bec998f9..ef3acc36 100644 --- a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch +++ b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch @@ -72,7 +72,7 @@ index b8b38e2..b76a3d3 100644 + if arch == 'aarch64': + image_data['glance_properties'] += \ + ' --property os_command_line=\'root=/dev/vda1 rw rootwait' + \ -+ 'console=tty0 console=ttyS0 console=ttyAMA0\'' + \ ++ ' console=tty0 console=ttyS0 console=ttyAMA0\'' + \ + ' --property hw_video_model=vga' + kernel_data = { + 'container_format': 'aki', @@ -81,7 +81,7 @@ index b8b38e2..b76a3d3 100644 + 'img_name': 'TestVM-kernel', + 'img_path': '{0}cirros-{1}-kernel'.format(img_dir, arch), + 'os_name': 'cirros', -+ 'min_ram': 64, ++ 'min_ram': 128, + 'glance_properties': '', + } + initrd_data = { @@ -91,7 +91,7 @@ index b8b38e2..b76a3d3 100644 + 'img_name': 'TestVM-initramfs', + 'img_path': '{0}cirros-{1}-initramfs'.format(img_dir, arch), + 'os_name': 'cirros', -+ 'min_ram': 64, ++ 'min_ram': 128, + 'glance_properties': '', + } + images += [kernel_data, initrd_data] -- cgit 1.2.3-korg