1 From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
2 Date: Tue, 22 Mar 2016 12:05:09 +0100
3 Subject: [PATCH] nova: Update vga, console defaults for armv7, aarch64
5 Nova hardcodes default options for both video=cirrus and console.
6 armv7 and aarch64 VMs require video=vga, and since most applications
7 use PL011 serial driver for guests, adding console=ttyAMA0 is also
10 .../openstack/files/nova-libvirt-vga-console.patch | 40 ++++++++++++++++++++++
11 .../openstack_tasks/manifests/roles/compute.pp | 19 ++++++++++
12 2 files changed, 59 insertions(+)
13 create mode 100644 deployment/puppet/openstack/files/nova-libvirt-vga-console.patch
15 diff --git a/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch
17 index 0000000..3594276
19 +++ b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch
21 +From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
22 +Date: Tue, 22 Mar 2016 12:05:09 +0100
23 +Subject: [PATCH] Update vga, console defaults for armv7 and aarch64
25 +Nova hardcodes default options for both video=cirrus and console.
26 +armv7 and aarch64 VMs require video=vga, and since most applications
27 +use PL011 serial driver for guests, adding console=ttyAMA0 is also
30 +Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
31 +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
34 +diff --git a/virt/libvirt/driver.py b/virt/libvirt/driver.py
35 +index 920a283..751b140 100644
36 +--- a/virt/libvirt/driver.py
37 ++++ b/virt/libvirt/driver.py
38 +@@ -3834,7 +3834,11 @@
39 + if virt_type == "xen":
40 + guest.os_cmdline = "ro root=%s" % root_device_name
42 ++ guestarch = libvirt_utils.get_arch(image_meta)
43 + guest.os_cmdline = ("root=%s %s" % (root_device_name, CONSOLE))
44 ++ if guestarch in (arch.ARMV7, arch.AARCH64):
45 ++ # NOTE(armband): ARM v7/v8 use PL011 drv, add ttyAMA0 console
46 ++ guest.os_cmdline += " console=ttyAMA0"
47 + if virt_type == "qemu":
48 + guest.os_cmdline += " no_timer_check"
49 + if instance.ramdisk_id:
50 +@@ -3972,7 +3972,9 @@ class LibvirtDriver(driver.ComputeDriver):
52 + elif CONF.libvirt.virt_type == 'parallels':
54 +- elif guestarch in (arch.PPC, arch.PPC64, arch.PPC64LE):
55 ++ elif guestarch in (arch.ARMV7, arch.AARCH64,
56 ++ arch.PPC, arch.PPC64, arch.PPC64LE):
57 ++ # NOTE(armband): Added ARM v7/v8, same as on PPC.
58 + # NOTE(ldbragst): PowerKVM doesn't support 'cirrus' be default
59 + # so use 'vga' instead when running on Power hardware.
61 diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
62 index b18fa7b..2f0f2a8 100644
63 --- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
64 +++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
65 @@ -158,6 +158,12 @@ class openstack_tasks::roles::compute {
67 include ::nova::params
69 + if ! defined(Package['patch']) {
71 + ensure => 'present',
77 # From legacy libvirt.pp
78 @@ -290,5 +296,6 @@ class openstack_tasks::roles::compute {
81 $notify_on_state_change = 'vm_and_task_state'
82 + $nova_path = '/usr/lib/python2.7/dist-packages/nova'
85 @@ -311,5 +318,17 @@ class openstack_tasks::roles::compute {
86 rabbit_heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
87 rabbit_heartbeat_rate => $rabbit_heartbeat_rate,
88 os_region_name => $region_name,
90 + # FIXME(armband): Workaround for missing arm defaults in nova libvirt driver
91 + file { "${nova_path}/libvirt-vga-console.patch":
93 + source => "puppet:///modules/openstack/nova-libvirt-vga-console.patch",
95 + exec { 'nova libvirt driver patch arm defaults':
96 + path => ['/usr/bin'],
97 + command => "patch -p1 < ${nova_path}/libvirt-vga-console.patch",
98 + unless => "patch -p1 -R -N --dry-run < ${nova_path}/libvirt-vga-console.patch",
100 + require => [Package['patch']],