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>

1 files changed, 103 insertions, 0 deletions

diff --git a/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch b/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch
new file mode 100644
index 00000000..a48e925f
--- /dev/null
+++ b/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch
@@ -0,0 +1,103 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Tue, 22 Mar 2016 12:05:09 +0100
+Subject: [PATCH] Update vga, console defaults for armv7 and aarch64
+
+Nova hardcodes default options for both video=cirrus and console.
+armv7 and aarch64 VMs require video=vga, and since most applications
+use PL011 serial driver for guests, adding console=ttyAMA0 is also
+a nice UX addition.
+---
+ .../openstack/files/nova-libvirt-vga-console.patch | 39 ++++++++++++++++++++++
+ deployment/puppet/openstack/manifests/compute.pp   | 19 +++++++++++
+ 2 files changed, 58 insertions(+)
+ create mode 100644 deployment/puppet/openstack/files/nova-libvirt-vga-console.patch
+
+diff --git a/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch
+new file mode 100644
+index 0000000..d33d4ee
+--- /dev/null
++++ b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch
+@@ -0,0 +1,39 @@
++From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
++Date: Tue, 22 Mar 2016 12:05:09 +0100
++Subject: [PATCH] Update vga, console defaults for armv7 and aarch64
++
++Nova hardcodes default options for both video=cirrus and console.
++armv7 and aarch64 VMs require video=vga, and since most applications
++use PL011 serial driver for guests, adding console=ttyAMA0 is also
++a nice UX addition.
++
++Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
++Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
++---
++
++diff --git a/virt/libvirt/driver.py b/virt/libvirt/driver.py
++index 920a283..751b140 100644
++--- a/virt/libvirt/driver.py
+++++ b/virt/libvirt/driver.py
++@@ -3834,7 +3834,11 @@
++         if virt_type == "xen":
++             guest.os_cmdline = "ro root=%s" % root_device_name
++         else:
+++            guestarch = libvirt_utils.get_arch(image_meta)
++             guest.os_cmdline = ("root=%s %s" % (root_device_name, CONSOLE))
+++            if guestarch in (arch.ARMV7, arch.AARCH64):
+++                # NOTE(armband): ARM v7/v8 use PL011 drv, add ttyAMA0 console
+++                guest.os_cmdline += " console=ttyAMA0"
++             if virt_type == "qemu":
++                 guest.os_cmdline += " no_timer_check"
++         if instance.ramdisk_id:
++@@ -3972,7 +3972,8 @@ class LibvirtDriver(driver.ComputeDriver):
++             video.type = 'xen'
++         elif CONF.libvirt.virt_type == 'parallels':
++             video.type = 'vga'
++-        elif guestarch in (arch.PPC, arch.PPC64):
+++        elif guestarch in (arch.ARMV7, arch.AARCH64, arch.PPC, arch.PPC64):
+++            # NOTE(armband): Added ARM v7/v8, same as on PPC.
++             # NOTE(ldbragst): PowerKVM doesn't support 'cirrus' be default
++             # so use 'vga' instead when running on Power hardware.
++             video.type = 'vga'
+diff --git a/deployment/puppet/openstack/manifests/compute.pp b/deployment/puppet/openstack/manifests/compute.pp
+index c0349dc..46b1801 100644
+--- a/deployment/puppet/openstack/manifests/compute.pp
++++ b/deployment/puppet/openstack/manifests/compute.pp
+@@ -157,6 +157,12 @@ class openstack::compute (
+     }
+   }
+ 
++  if ! defined(Package['patch']) {
++    package { 'patch':
++      ensure => 'present',
++    }
++  }
++
+   $glance_connection = $glance_api_servers
+ 
+   case $::osfamily {
+@@ -250,6 +256,7 @@ class openstack::compute (
+ 
+   $memcached_addresses =  suffix($cache_server_ip, inline_template(":<%= @cache_server_port %>"))
+   $notify_on_state_change = 'vm_and_task_state'
++  $nova_path = '/usr/lib/python2.7/dist-packages/nova'
+ 
+   class { 'nova':
+       install_utilities      => false,
+@@ -273,6 +280,18 @@ class openstack::compute (
+       service_down_time      => $nova_service_down_time,
+       notify_on_state_change => $notify_on_state_change,
+       memcached_servers      => $memcached_addresses,
++  } ->
++  # FIXME(armband): Workaround for missing arm defaults in nova libvirt driver
++  file { "${nova_path}/libvirt-vga-console.patch":
++    ensure => "file",
++    source => "puppet:///modules/openstack/nova-libvirt-vga-console.patch",
++  } ->
++  exec { 'nova libvirt driver patch arm defaults':
++    path    => ['/usr/bin'],
++    command => "patch -p1 < ${nova_path}/libvirt-vga-console.patch",
++    unless  => "patch -p1 -R -N --dry-run < ${nova_path}/libvirt-vga-console.patch",
++    cwd     => $nova_path,
++    require => [Package['patch']],
+   }
+ 
+   if str2bool($::is_virtual) {