aboutsummaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.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/0010-nova-Fix-inject-for-direct-boot-with-part-table.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/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch')
-rw-r--r--patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch90
1 files changed, 0 insertions, 90 deletions
diff --git a/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch b/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch
deleted file mode 100644
index 372386a3..00000000
--- a/patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Fri, 25 Mar 2016 16:12:08 +0100
-Subject: [PATCH] nova: Fix inject for direct boot with part table.
-
-See [1] 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).
-
-[1] https://bugs.launchpad.net/nova/+bug/1290455
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
----
- .../openstack/files/nova-libvirt-inject.patch | 44 ++++++++++++++++++++++
- deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 12 ++++++
- 2 files changed, 56 insertions(+)
- create mode 100644 deployment/puppet/openstack/files/nova-libvirt-inject.patch
-
-diff --git a/deployment/puppet/openstack/files/nova-libvirt-inject.patch b/deployment/puppet/openstack/files/nova-libvirt-inject.patch
-new file mode 100644
-index 0000000..9cbfe5f
---- /dev/null
-+++ b/deployment/puppet/openstack/files/nova-libvirt-inject.patch
-@@ -0,0 +1,44 @@
-+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-+Date: Tue, 22 Mar 2016 12:05:09 +0100
-+Subject: [PATCH] Fix inject for direct boot with partition table
-+
-+See [1] 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).
-+
-+[1] https://bugs.launchpad.net/nova/+bug/1290455
-+
-+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-+Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.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
-+@@ -34,6 +34,7 @@
-+ import mmap
-+ import operator
-+ import os
-++import re
-+ import shutil
-+ import tempfile
-+ import time
-+@@ -2820,7 +2821,15 @@
-+ """
-+ # Handles the partition need to be used.
-+ target_partition = None
-+- if not instance.kernel_id:
-++ image_meta = objects.ImageMeta.from_instance(instance)
-++ # FIXME(armband): https://bugs.launchpad.net/nova/+bug/1290455
-++ # Support direct kernel boot with a partition table inside disk image:
-++ # pass target_partition when root kernel arg points to a partition
-++ # (instead of the whole disk).
-++ has_partition_table = re.search("root=/dev/.d.([1-9]+)",
-++ str(image_meta.properties.get("os_command_line")))
-++
-++ if not instance.kernel_id or has_partition_table:
-+ target_partition = CONF.libvirt.inject_partition
-+ if target_partition == 0:
-+ target_partition = None
-diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
-index 46b1801..d42d6a1 100644
---- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
-+++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
-@@ -281,4 +281,16 @@ class openstack::compute (
- } ->
-+ # FIXME(armband): Fix inject for part image direct boot (bug LP #1469308)
-+ file { "${nova_path}/libvirt-inject.patch":
-+ ensure => "file",
-+ source => "puppet:///modules/openstack/nova-libvirt-inject.patch",
-+ } ->
-+ exec { 'nova libvirt driver patch partitioned injection':
-+ path => ['/usr/bin'],
-+ command => "patch -p1 < ${nova_path}/libvirt-inject.patch",
-+ unless => "patch -p1 -R -N --dry-run < ${nova_path}/libvirt-inject.patch",
-+ cwd => $nova_path,
-+ require => [Package['patch']],
-+ } ->
- # FIXME(armband): Workaround for missing arm defaults in nova libvirt driver
- file { "${nova_path}/libvirt-vga-console.patch":
- ensure => "file",