diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-01 13:18:11 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-09 16:33:43 +0200 |
commit | 42f8585ebb8fffad19a89314659ab9129176c3e9 (patch) | |
tree | e2cf6a4797bcbd036e080541cc3925f8b209549b /patches/fuel-library/0003-compute-Fix-virtlogd-not-started-after-install.patch | |
parent | 6f3a054fc95622f0c002f72c0fac6074bb36c36f (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/0003-compute-Fix-virtlogd-not-started-after-install.patch')
-rw-r--r-- | patches/fuel-library/0003-compute-Fix-virtlogd-not-started-after-install.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/patches/fuel-library/0003-compute-Fix-virtlogd-not-started-after-install.patch b/patches/fuel-library/0003-compute-Fix-virtlogd-not-started-after-install.patch new file mode 100644 index 00000000..a9a49331 --- /dev/null +++ b/patches/fuel-library/0003-compute-Fix-virtlogd-not-started-after-install.patch @@ -0,0 +1,33 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Fri, 15 Jul 2016 17:22:44 +0200 +Subject: [PATCH] compute: Fix virtlogd not started after install + +libvirt >= 1.3.0 installs additional services, including virtlogd, +which need to be started explicitly after install, as the Ubuntu UCA +package is currently broken. + +Fuel code already carries a fix for this, but only for UCA libvirt. +Refactor the condition for the existing fix to check package version +instead of origin. + +Closes-bug: https://jira.opnfv.org/browse/ARMBAND-37 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +index 164bd70..211fefa 100644 +--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp ++++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +@@ -337,7 +337,8 @@ class openstack_tasks::roles::compute { + + # TODO(aschultz): work around until https://review.openstack.org/#/c/306677/ + # lands. +- if $::os_package_type == 'ubuntu' { ++ # Armband: also apply for our libvirt-bin deb package (>=1.3.0 version) ++ if (versioncmp($::libvirt_package_version, '1.3.0') >= 0) { + ensure_resource('service', ['virtlogd','virtlockd'], { + ensure => running, + enable => true, |