summaryrefslogtreecommitdiffstats
path: root/patches/fuel-web
diff options
context:
space:
mode:
authorStanislaw Kardach <kda@semihalf.com>2016-03-29 15:06:02 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-03-29 14:16:43 +0000
commit0f762e556ea7b2393f56ca7fb8e06f66f99880aa (patch)
treeb29dfebef5de0a545f190d28f061cedf813195fe /patches/fuel-web
parentccf57699bbff183ef45fd4a4e94df094ca69ee87 (diff)
Clean up and fix Libvirt and Ceph
[ Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> ] * Fix upload_cirros timeout * Workaround for default video device in nova * Fix syntax and increase TestVM's RAM requirements [ Alexandru Avadanii <Alexandru.Avadanii@enea.com> ] * 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 <stanislaw.kardach@caviumnetworks.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-web')
-rw-r--r--patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch6
1 files changed, 3 insertions, 3 deletions
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]