summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/0016-compute-Fix-virtlogd-not-started-after-install.patch
blob: 752ef6f8a6e5b7f9bfc481d818f54c9b4c0b30c4 (plain)
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
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 33e851f..3647f9b 100644
--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
+++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
@@ -373,7 +373,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,