From 42f8585ebb8fffad19a89314659ab9129176c3e9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 1 Oct 2016 13:18:11 +0200 Subject: 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 --- ...er-Fix-libvirt-bin-group-name-for-armband.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 patches/fuel-library/0002-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch (limited to 'patches/fuel-library/0002-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch') diff --git a/patches/fuel-library/0002-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch b/patches/fuel-library/0002-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch new file mode 100644 index 00000000..17700a9a --- /dev/null +++ b/patches/fuel-library/0002-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch @@ -0,0 +1,46 @@ +From: Alexandru Avadanii +Date: Mon, 18 Apr 2016 18:44:27 +0200 +Subject: [PATCH] ceilometer: Fix libvirt-bin group name for armband. + +Upstream mirrors use a custom version of libvirt, ported from +Debian, while keeping the Ubuntu ceilometer package, leading to a +libvirt group name mismatch between the two. + +Fuel-library hardcodes a deb-version test for libvirt-bin, which +enforces the use of "libvirt" instead of "libvirtd" for 1.2.9 or +newer libvirt-bin [1]. + +Armband brings its own 1.3.2 libvirt-bin package, which respects +Ubuntu standard group naming ("libvirtd"), but since 1.3.2 > 1.2.9, +the old group name ("libvirt") is still used. + +This patch extends the version checking introduced in [1]: + - libvirt-bin 1.3.2 or newer will use "libvirtd" naming; + - libvirt-bin 1.2.9 ... <1.3.2 will use "libvirt". + +[1] https://review.openstack.org/#/c/200602/8/deployment/puppet/ + openstack/manifests/ceilometer.pp +--- + deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp +index af4f0e5..e8dbfcf 100644 +--- a/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp ++++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp +@@ -93,8 +93,14 @@ class openstack_tasks::ceilometer::compute { + } + + if $::operatingsystem == 'Ubuntu' and $::ceilometer::params::libvirt_group { ++ # Armband libvirt-bin deb package (1.3.2 version) creates 'libvirtd' group on Ubuntu ++ if (versioncmp($::libvirt_package_version, '1.3.2') >= 0) { ++ User<| name == 'ceilometer' |> { ++ groups => ['nova', 'libvirtd'], ++ } ++ } + # Our libvirt-bin deb package (1.2.9 version) creates 'libvirt' group on Ubuntu +- if (versioncmp($::libvirt_package_version, '1.2.9') >= 0) { ++ elsif (versioncmp($::libvirt_package_version, '1.2.9') >= 0) { + User<| name == 'ceilometer' |> { + groups => ['nova', 'libvirt'], + } -- cgit 1.2.3-korg