summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-01 13:18:11 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-09 16:33:43 +0200
commit42f8585ebb8fffad19a89314659ab9129176c3e9 (patch)
treee2cf6a4797bcbd036e080541cc3925f8b209549b /patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch
parent6f3a054fc95622f0c002f72c0fac6074bb36c36f (diff)
build: Rework patch mechanism for Fuel submodules
While refactoring the patching mechanism, take care of: - Sync submodule handling with Fuel@OPFNV; - build: Investigate/prepare for moving patches to Fuel@OPNFV; - build: Investigate divergent fuel-mirror; - ISO build: cacheid for Fuel comps should not depend on Armband git commit; CHANGE: Rename/shuffle patches while grouping them in "features", preparing for upstreaming them to Fuel@OPNFV and beyond. CHANGE: Allow linking patches for better representing the dependency between one patch and different features. e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch: - part of `multiarch-fuel`, because it extends Fuel; - part of `direct-kernel-boot`, as arch is required for that; - part of `cross-bootstrap`, target image is arch-dependent; NOTE: Patch links are not staged to Fuel@OPNFV, they only serve as markers that a specific patch is part of a feature. CHANGE: Kill all Fuel component submodules, now handled in Fuel@OPNFV: - fuel-agent - fuel-astute - fuel-library - fuel-mirror - fuel-nailgun-agent - fuel-web CHANGE: Move armband-fuel-config.mk to armband git root. FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT part of `cross-bootstrap` feature, but patch context says so ... FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at `make patches-export` by removing spaces at EOL. v2 -> v3: * Phony patch support (links to show a patch belongs to a feature); * Updated README.md v3 -> v7: * Re-export Fuel submodules & plugins patches (update patch context); * Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/); * Ignore submodule changes; * Add armband git repo info to gitinfo_fuel.txt at build time; Implements: ARMBAND-136 Closes-bug: ARMBAND-95 Closes-bug: ARMBAND-93 Closes-bug: ARMBAND-92 Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch')
-rw-r--r--patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch104
1 files changed, 104 insertions, 0 deletions
diff --git a/patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch b/patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch
new file mode 100644
index 00000000..9e9c3d53
--- /dev/null
+++ b/patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch
@@ -0,0 +1,104 @@
+From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
+Date: Tue, 22 Mar 2016 12:05:09 +0100
+Subject: [PATCH] nova: Update vga, console defaults for armv7, 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 | 40 ++++++++++++++++++++++
+ .../openstack_tasks/manifests/roles/compute.pp | 19 ++++++++++
+ 2 files changed, 59 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..3594276
+--- /dev/null
++++ b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch
+@@ -0,0 +1,40 @@
++From: Stanislaw Kardach <stanislaw.kardach@cavium.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@cavium.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,9 @@ class LibvirtDriver(driver.ComputeDriver):
++ video.type = 'xen'
++ elif CONF.libvirt.virt_type == 'parallels':
++ video.type = 'vga'
++- elif guestarch in (arch.PPC, arch.PPC64, arch.PPC64LE):
+++ elif guestarch in (arch.ARMV7, arch.AARCH64,
+++ arch.PPC, arch.PPC64, arch.PPC64LE):
+++ # 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_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
+index b18fa7b..2f0f2a8 100644
+--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
++++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
+@@ -158,6 +158,12 @@ class openstack_tasks::roles::compute {
+
+ include ::nova::params
+
++ if ! defined(Package['patch']) {
++ package { 'patch':
++ ensure => 'present',
++ }
++ }
++
+ case $::osfamily {
+ 'RedHat': {
+ # From legacy libvirt.pp
+@@ -290,6 +296,7 @@ class openstack_tasks::roles::compute {
+ }
+
+ $notify_on_state_change = 'vm_and_task_state'
++ $nova_path = '/usr/lib/python2.7/dist-packages/nova'
+
+ class { '::nova':
+ rpc_backend => $rpc_backend_real,
+@@ -311,6 +318,18 @@ class openstack_tasks::roles::compute {
+ memcached_servers => $memcached_addresses,
+ cinder_catalog_info => pick($nova_hash_real['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'),
+ rabbit_heartbeat_timeout_threshold => $::os_service_default,
++ } ->
++ # 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']],
+ }
+
+ class { '::nova::availability_zone':