From 88c8e922fc8831a2f8c6ef2bd79ab90b63920efc Mon Sep 17 00:00:00 2001 From: Kris Lindgren Date: Wed, 29 Jul 2015 14:58:52 -0600 Subject: [PATCH] Add epoch and versions to python-ceilometer requirements Change-Id: Ic32e9f527b0a48bf76457921efb6e367c3b586d1 --- .../packaging/specs/openstack-ceilometer.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/conf/templates/packaging/specs/openstack-ceilometer.spec b/conf/templates/packaging/specs/openstack-ceilometer.spec index 470d4850..58bee9f6 100644 --- a/conf/templates/packaging/specs/openstack-ceilometer.spec +++ b/conf/templates/packaging/specs/openstack-ceilometer.spec @@ -14,6 +14,7 @@ Name: openstack-ceilometer Version: %{os_version}$version_suffix Release: $release%{?dist} Summary: OpenStack measurement collection service +Epoch: $epoch Group: Applications/System License: ASL 2.0 @@ -122,7 +123,7 @@ This package contains the ceilometer python library. Summary: Components common to all OpenStack ceilometer services Group: Applications/System -Requires: python-ceilometer +Requires: python-ceilometer = %{epoch}:%{version}-%{release} Requires(pre): shadow-utils @@ -137,7 +138,7 @@ ceilometer services. Summary: OpenStack ceilometer compute agent Group: Applications/System -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: python-novaclient Requires: python-keystoneclient @@ -154,7 +155,7 @@ running on OpenStack compute nodes. Summary: OpenStack ceilometer central agent Group: Applications/System -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: python-novaclient Requires: python-keystoneclient @@ -171,7 +172,7 @@ This package contains the central ceilometer agent. Summary: OpenStack ceilometer collector agent Group: Applications/System -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: python-pymongo @@ -185,7 +186,7 @@ This package contains the ceilometer collector agent. Summary: OpenStack ceilometer API service Group: Applications/System -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: python-pymongo Requires: python-flask @@ -202,7 +203,7 @@ This package contains the ceilometer API service. Summary: OpenStack ceilometer alarm services Group: Applications/System -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: python-ceilometerclient %description alarm @@ -217,7 +218,7 @@ and evaluation services. Summary: OpenStack ceilometer notifier services Group: Applications/System -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: python-ceilometerclient %description notification @@ -233,7 +234,7 @@ and evaluation services. Summary: OpenStack ceilometer ipmi agent Group: Applications/System -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: python-novaclient Requires: python-keystoneclient @@ -256,7 +257,7 @@ by-passing Ironic's management of baremetal. Summary: OpenStack ceilometer polling agent Group: Applications/System -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description polling Ceilometer aims to deliver a unique point of contact for billing systems to