1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
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..c5f8e5a
--- /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) {
|
