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 +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 d192aa6..5de9872 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 - 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 - 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 d7b1fd4..3cd1a7c 100644 --- a/sources +++ b/sources @@ -1 +1,37 @@ +390ce952e348614338df23de3d1d2974 apache-bbf9278b24931444022aa67140d3505b748151da.tar.gz +61bd9a070de2beb468493fef6886d6d4 ceilometer-55cbdace1730a3cb0af780ab9f7be703ac873eab.tar.gz +35c3c53f442b591a4da3bfa75610069d certmonger-5fbf10fbbff4aed4db30e839c63c99b195e8425a.tar.gz +eabb902f6211f5b6818b05b656a45a7f cinder-164163a7a267ae4139e2d97bab1a385a6da2ac5f.tar.gz +6e70f75bbb494957eb64e5b71f835bd3 common-2c0ed2844c606fd806bde0c02e47e79c88fab4a9.tar.gz +8cff08df8d7fe83817af8b4ba5b13227 concat-031bf261289dcbb32e63b053ed5b3a82117698c0.tar.gz +3c338845ca69b093a065cae1c35996c0 firewall-c147a624fb3dba7df625d0d7571b1b6669bcfca5.tar.gz +7db8cc1e7e4ea4370fb8d71f47da4a76 galera-3b0a3c99419c3407e5d880213d62159c42713668.tar.gz +590eefb9f7520cf37b3513031dba426f glance-cb0daf02d7a991be642e62294912d93b036c6a5a.tar.gz +7d21112588ba43525f2006fd65a00b07 gluster-80c2b13448c97c70a4b4bc0e402e00ecb5d681d5.tar.gz +edef1e76ec9200bb1989302f19ea18b9 haproxy-f381510e940ee11feb044c1c728ba2e5af807c79.tar.gz +4dc6a108d2474aa9dd38a8d44914858c heat-a64082e4f8ec75ecadaf20a02678647a7af22fb6.tar.gz +4b24a19668635cc11f7578f17ab12ebe horizon-17ba6a73cec7f386922e6a914a120a829e225efc.tar.gz +b92cb5bb97ea2c2ccdd6fbd361cbb2e7 inifile-fe9b0d5229ea37179a08c4b49239da9bc950acd1.tar.gz +63063035247258a08875e17cddecfb3f keystone-688ff4379ed7437747ff8fdcd464096e24b4ebc6.tar.gz +d91faa359ff81cc3e5bdc2a4217afff5 memcached-49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7.tar.gz +25f400100566e0a10580b84835126631 mongodb-3f392925710f1758a95f1775d700b5fb787a003d.tar.gz +e90d1ac45fcdfe905452bfe8132c8ee9 mysql-54588506e6d82bbd079739799a3fa50696a83a01.tar.gz +e5a5e314c4b96d79d467cd0afa72b60f neutron-66c436bc2f06c5a71d79c674697394a11ec227f9.tar.gz +2f0d23068f0eb1916755787b1d7bb9ae nova-1e77a9d48a85a3ae6d30993b3c887f58e4a5973c.tar.gz +ee40158527431488131f4331092b958c nssdb-b3799a9a7c62c3b5b7968f9860220a885b45fb8a.tar.gz +b210832794c85b5f4e5aa75de0007b51 openstack-c20039004cb39e78c93cd00f154c3b9ba6404951.tar.gz +8a56f0deff38aaffff3fb56a35dbfef9 pacemaker-21950c9b5e619a3cb02f01f66cd4cb33d209a690.tar.gz +625ce5ea3a37e0d1e4a0b1c09b6495ff puppet-07ec49d1f67a498b31b4f164678a76c464e129c4.tar.gz +28c069a264720c8f5f8f4dd631cfc959 qpid-953028ba9abdf563bd95970ccf890237711072fb.tar.gz +a05c3e7ba8e2055a15901d1ddbd8cb79 rabbitmq-e7447851a60a419cd51a09ccf807964b36fdebac.tar.gz +b5d0c1c4cd711a3f762052813ad6a1bc rsync-357d51f3a6a22bc3da842736176c3510e507b4fb.tar.gz +1a50e27c52661099d075556242a4a26e ssh-d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4.tar.gz +387ad714db76de1e17b810b9db930f3f staging-887275d8fb20e148c6f9eb327f1f6c8ea5ee280f.tar.gz +4e4a07838966a58f90eab3c5b8e4baea stdlib-62e8c1d76902e6f22cb9f7b3abd43e757b4130a3.tar.gz +40e3880094154a236bbcaf84b8e894b0 swift-e9b69499c943bfbb16c895611ebd4e90c16b377c.tar.gz +9f332abf798b359d5f6d732a8b8fe95a sysctl-c4486acc2d66de857dbccd8b4b945ea803226705.tar.gz +94bdd18f8975f0e9d70ae48c1cdc62c6 tempest-44e258746cb0cf9a53f37122d510474aed39201e.tar.gz +ad2529c2b5932c55392ac0fed0ab9ef5 vcsrepo-6f7507a2a48ff0a58c7db026760a2eb84e382a77.tar.gz +203d13bff413d180c5347364679be2a1 vlan-c937de75c28e63fba8d8738ad6a5f2ede517e53d.tar.gz +d0808da5ad0ac1227a2d2d78ff66a9b1 vswitch-a20f6355f048d2cb6206222b2d045b41ac875db4.tar.gz 5ebe0f1f25defa3acdab0b4682e49f52 xinetd-bba48fad94c6538384173e60900a17c6f7ef7ca3.tar.gz