summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-13 19:37:20 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-16 12:01:02 +0000
commit2741c6e75c660727177b9d32d5cf29c60b40eb25 (patch)
treeaa0c68d520701d58380fd6fa7989576ba0406200 /patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch
parent85c96cb879081b3b13a6d53c50866637d09f9f42 (diff)
Rebase: p/fuel-library: Update after 96da5b4a.
Refresh patches after: "Move openstack specific tasks to their own folder structure" NOTE: The qemu-kvm change patch (0003-Make-qemu-kvm-architecture-aware.patch) only affects RedHat systems, so it is optional, at least for the current stage. [1] https://github.com/openstack/fuel-library/commit/ 96da5b4a1eb82a76fb416d93f5249dc32e2499f2 Change-Id: Ibd1fd3f7e45d7947c90336bbe7e2ace101b5802b
Diffstat (limited to 'patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch')
-rw-r--r--patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch b/patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch
index 63f2c1ca..36353a89 100644
--- a/patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch
+++ b/patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch
@@ -21,16 +21,15 @@ This patch extends the version checking introduced in [1]:
[1] https://review.openstack.org/#/c/200602/8/deployment/puppet/
openstack/manifests/ceilometer.pp
---
- deployment/puppet/openstack/manifests/ceilometer.pp | 8 +++++++-
+ deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
-diff --git a/deployment/puppet/openstack/manifests/ceilometer.pp b/deployment/puppet/openstack/manifests/ceilometer.pp
+diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp
index 8311731..1d7af2b 100644
---- a/deployment/puppet/openstack/manifests/ceilometer.pp
-+++ b/deployment/puppet/openstack/manifests/ceilometer.pp
-@@ -195,8 +195,14 @@ class openstack::ceilometer (
+--- a/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp
++++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp
+@@ -195,7 +195,13 @@ class openstack::ceilometer (
- if ($on_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) {