diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-07-15 17:29:09 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-07-15 17:30:12 +0200 |
| commit | fa99f0ee965b7e871c91fa1764a4dfd07648c120 (patch) | |
| tree | 89e55d3ccac5327ce93179aeb56fc4cdb3be59ad | |
| parent | 31087865b416f0eab066377c76a0d580d3fd8bd1 (diff) | |
fuel-library: Fix virtlogd not started
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
Change-Id: I651ab48072ddcbfb88ce78a66c25cb524e442981
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | patches/fuel-library/0016-compute-Fix-virtlogd-not-started-after-install.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/patches/fuel-library/0016-compute-Fix-virtlogd-not-started-after-install.patch b/patches/fuel-library/0016-compute-Fix-virtlogd-not-started-after-install.patch new file mode 100644 index 00000000..752ef6f8 --- /dev/null +++ b/patches/fuel-library/0016-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 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, |