patches/fuel-library/0016-compute-Fix-virtlogd-not-started-after-install.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Fri, 15 Jul 2016 17:22:44 +0200
   3 Subject: [PATCH] compute: Fix virtlogd not started after install
   4
   5 libvirt >= 1.3.0 installs additional services, including virtlogd,
   6 which need to be started explicitly after install, as the Ubuntu UCA
   7 package is currently broken.
   8
   9 Fuel code already carries a fix for this, but only for UCA libvirt.
  10 Refactor the condition for the existing fix to check package version
  11 instead of origin.
  12
  13 Closes-bug: https://jira.opnfv.org/browse/ARMBAND-37
  14
  15 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  16 ---
  17  deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 3 ++-
  18  1 file changed, 2 insertions(+), 1 deletion(-)
  19
  20 diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
  21 index 33e851f..3647f9b 100644
  22 --- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
  23 +++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp
  24 @@ -373,7 +373,8 @@ class openstack_tasks::roles::compute {
  25
  26      # TODO(aschultz): work around until https://review.openstack.org/#/c/306677/
  27      # lands.
  28 -    if $::os_package_type == 'ubuntu' {
  29 +    # Armband: also apply for our libvirt-bin deb package (>=1.3.0 version)
  30 +    if (versioncmp($::libvirt_package_version, '1.3.0') >= 0) {
  31        ensure_resource('service', ['virtlogd','virtlockd'], {
  32          ensure => running,
  33          enable => true,