[openstack-puppet-modules/el6-icehouse] Updated module set
Martin Mágr
mmagr at fedoraproject.org
Fri May 30 14:47:21 UTC 2014
commit 5a48d4258213398b3b78560961120a3c46fbfa26
Author: Martin Magr <mmagr at redhat.com>
Date: Fri May 30 16:24:56 2014 +0200
Updated module set
- Synchronized with recent master branch of redhat-openstack/openstack-puppet-modules
- Added necessary puppet-ceilometer patch
0001-Fixes-agent_notification_service_name.patch | 52 ++++++++++++++++++++++
openstack-puppet-modules.spec | 12 ++++-
sources | 2 +-
3 files changed, 63 insertions(+), 3 deletions(-)
---
diff --git a/0001-Fixes-agent_notification_service_name.patch b/0001-Fixes-agent_notification_service_name.patch
new file mode 100644
index 0000000..2b7ddbe
--- /dev/null
+++ b/0001-Fixes-agent_notification_service_name.patch
@@ -0,0 +1,52 @@
+From 536b22212dbaba70be514ea4f63e72364033f722 Mon Sep 17 00:00:00 2001
+From: Ivan Chavero <ichavero at redhat.com>
+Date: Mon, 26 May 2014 06:54:45 -0600
+Subject: [PATCH] Fixes agent_notification_service_name
+
+In icehouse the agent_notification_service_name has changed
+from ceilometer-agent-notification service to ceilometer-notification
+
+Change-Id: Ie2703a028ce154efa7fa1d0da58914230adfc7db
+---
+ manifests/params.pp | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/manifests/params.pp b/manifests/params.pp
+index feb1e19..916ee7c 100644
+--- a/manifests/params.pp
++++ b/manifests/params.pp
+@@ -23,11 +23,31 @@ class ceilometer::params {
+ $agent_compute_service_name = 'openstack-ceilometer-compute'
+ $api_service_name = 'openstack-ceilometer-api'
+ $collector_service_name = 'openstack-ceilometer-collector'
+- $agent_notification_service_name = 'openstack-ceilometer-agent-notification'
+ $alarm_notifier_service_name = 'openstack-ceilometer-alarm-notifier'
+ $alarm_evaluator_service_name = 'openstack-ceilometer-alarm-evaluator'
+ $pymongo_package_name = 'python-pymongo'
+ $psycopg_package_name = 'python-psycopg2'
++ case $::operatingsystem {
++ 'RedHat', 'CentOS': {
++ if $::operatingsystemrelease >= 7.0 {
++ $agent_notification_service_name = 'openstack-ceilometer-notification'
++ }
++ else {
++ $agent_notification_service_name = 'openstack-ceilometer-agent-notification'
++ }
++ }
++ 'Fedora': {
++ if $::operatingsystemrelease >= 20 {
++ $agent_notification_service_name = 'openstack-ceilometer-notification'
++ }
++ else {
++ $agent_notification_service_name = 'openstack-ceilometer-agent-notification'
++ }
++ }
++ default: {
++ $agent_notification_service_name = 'openstack-ceilometer-notification'
++ }
++ }
+ # db packages
+ if $::operatingsystem == 'Fedora' and $::operatingsystemrelease >= 18 {
+ # fallback to stdlib version, not provided on fedora
+--
+1.8.5.3
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 060c4ef..0c530aa 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -24,7 +24,7 @@
%global pacemaker_commit 21950c9b5e619a3cb02f01f66cd4cb33d209a690
%global puppet_commit 07ec49d1f67a498b31b4f164678a76c464e129c4
%global qpid_commit 953028ba9abdf563bd95970ccf890237711072fb
-%global rabbitmq_commit 015bd788ccb495051a2db48e344a3a6aa3381076
+%global rabbitmq_commit e7447851a60a419cd51a09ccf807964b36fdebac
%global rsync_commit 357d51f3a6a22bc3da842736176c3510e507b4fb
%global ssh_commit d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
%global staging_commit 887275d8fb20e148c6f9eb327f1f6c8ea5ee280f
@@ -40,7 +40,7 @@
Name: openstack-puppet-modules
Version: 2014.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Puppet modules used to deploy OpenStack
License: ASL 2.0 and GPLv2 and GPLv3
@@ -93,6 +93,7 @@ Patch5: nova.patch
Patch6: 0001-Use-lioadm-as-iscsi-helper-on-RHEL-7.patch
Patch7: 0001-Quickfix-to-remove-duplication-with-ceilometer-agent.patch
Patch8: puppetlabs-firewall-pull-request-337.patch
+Patch9: 0001-Fixes-agent_notification_service_name.patch
BuildArch: noarch
Requires: rubygem-json
@@ -167,6 +168,9 @@ cd %{_builddir}/%{name}-%{version}/puppet-keystone-%{keystone_commit}
cd %{_builddir}/%{name}-%{version}/puppetlabs-firewall-%{firewall_commit}
%patch8 -p1
+# puppet-ceilometer patches
+cd %{_builddir}/%{name}-%{version}/puppet-ceilometer-%{ceilometer_commit}
+%patch9 -p1
find %{_builddir}/%{name}-%{version}/ -type f -name ".*" -exec rm {} +
find %{_builddir}/%{name}-%{version}/ -size 0 -exec rm {} +
@@ -226,6 +230,10 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Fri May 30 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-13
+- Synchronized modules with current master branch of redhat-openstack/openstack-puppet-modules
+- Added 0001-Fixes-agent_notification_service_name.patch
+
* Fri May 23 2014 Martin Mágr <mmagr at redhat.com> - 2014.1-12
- Synchronized modules with current master branch of redhat-openstack/openstack-puppet-modules
- Removed glance.patch since the changes are now upstream
diff --git a/sources b/sources
index 9e79bf9..3cd1a7c 100644
--- a/sources
+++ b/sources
@@ -23,7 +23,7 @@ b210832794c85b5f4e5aa75de0007b51 openstack-c20039004cb39e78c93cd00f154c3b9ba640
8a56f0deff38aaffff3fb56a35dbfef9 pacemaker-21950c9b5e619a3cb02f01f66cd4cb33d209a690.tar.gz
625ce5ea3a37e0d1e4a0b1c09b6495ff puppet-07ec49d1f67a498b31b4f164678a76c464e129c4.tar.gz
28c069a264720c8f5f8f4dd631cfc959 qpid-953028ba9abdf563bd95970ccf890237711072fb.tar.gz
-e2b73c9ca16d412cd270d3bcdb06dacf rabbitmq-015bd788ccb495051a2db48e344a3a6aa3381076.tar.gz
+a05c3e7ba8e2055a15901d1ddbd8cb79 rabbitmq-e7447851a60a419cd51a09ccf807964b36fdebac.tar.gz
b5d0c1c4cd711a3f762052813ad6a1bc rsync-357d51f3a6a22bc3da842736176c3510e507b4fb.tar.gz
1a50e27c52661099d075556242a4a26e ssh-d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4.tar.gz
387ad714db76de1e17b810b9db930f3f staging-887275d8fb20e148c6f9eb327f1f6c8ea5ee280f.tar.gz
More information about the scm-commits
mailing list