[openstack-puppet-modules/icehouse-epel7] Added Nova/Ceilometer quickfix
Martin Mágr
mmagr at fedoraproject.org
Mon May 12 16:51:02 UTC 2014
commit cb37b78af86073101cf3a4c1b43733c8692a76dd
Author: Martin Magr <mmagr at redhat.com>
Date: Mon May 12 18:45:47 2014 +0200
Added Nova/Ceilometer quickfix
...-remove-duplication-with-ceilometer-agent.patch | 36 ++++++++++++++++++++
openstack-puppet-modules.spec | 7 +++-
2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/0001-Quickfix-to-remove-duplication-with-ceilometer-agent.patch b/0001-Quickfix-to-remove-duplication-with-ceilometer-agent.patch
new file mode 100644
index 0000000..157953e
--- /dev/null
+++ b/0001-Quickfix-to-remove-duplication-with-ceilometer-agent.patch
@@ -0,0 +1,36 @@
+From 488d8e82e7df1b67718f5feee166c07f4698f533 Mon Sep 17 00:00:00 2001
+From: Martin Magr <mmagr at redhat.com>
+Date: Mon, 12 May 2014 18:40:06 +0200
+Subject: [PATCH] Quickfix to remove duplication with
+ ceilometer::agent::compute class
+
+---
+ manifests/compute.pp | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/manifests/compute.pp b/manifests/compute.pp
+index 71eb566..07b118d 100644
+--- a/manifests/compute.pp
++++ b/manifests/compute.pp
+@@ -138,18 +138,6 @@ class nova::compute (
+ }
+ }
+
+- if $instance_usage_audit and $instance_usage_audit_period in ['hour', 'day', 'month', 'year'] {
+- nova_config {
+- 'DEFAULT/instance_usage_audit': value => $instance_usage_audit;
+- 'DEFAULT/instance_usage_audit_period': value => $instance_usage_audit_period;
+- }
+- } else {
+- nova_config {
+- 'DEFAULT/instance_usage_audit': ensure => absent;
+- 'DEFAULT/instance_usage_audit_period': ensure => absent;
+- }
+- }
+-
+ package { 'pm-utils':
+ ensure => present,
+ }
+--
+1.8.5.3
+
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 5421a1b..d145c06 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -40,7 +40,7 @@
Name: openstack-puppet-modules
Version: 2014.1
-Release: 10%{?dist}
+Release: 10.1%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
@@ -92,6 +92,7 @@ Patch4: cinder.patch
Patch5: keystone.patch
Patch6: nova.patch
Patch7: 0001-Use-lioadm-as-iscsi-helper-on-RHEL-7.patch
+Patch8: 0001-Quickfix-to-remove-duplication-with-ceilometer-agent.patch
BuildArch: noarch
Requires: rubygem-json
@@ -143,6 +144,7 @@ A collection of Puppet modules used to install and configure OpenStack.
cd %{_builddir}/%{name}-%{version}/puppet-nova-%{nova_commit}
%patch0 -p1
%patch6 -p1
+%patch8 -p1
# puppet-glance patches
cd %{_builddir}/%{name}-%{version}/puppet-glance-%{glance_commit}
@@ -223,6 +225,9 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Mon May 12 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-10.1
+- Added 0001-Quickfix-to-remove-duplication-with-ceilometer-agent.patch
+
* Mon May 12 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-10
- Synchronized modules with current master branch of redhat-openstack/openstack-puppet-modules
More information about the scm-commits
mailing list