[openstack-cinder/el6-icehouse] authtoken configuration is out of paste.ini
Alan Pevec
apevec at fedoraproject.org
Tue Apr 29 20:25:24 UTC 2014
commit d3d2cccc8e6e22b3d4454e506635aad39bb1bc86
Author: Alan Pevec <apevec at redhat.com>
Date: Tue Apr 29 22:21:36 2014 +0200
authtoken configuration is out of paste.ini
since https://github.com/openstack/cinder/commit/5d04c6d1df953c5beefe751ff8e9c332e25b2661
openstack-cinder.spec | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index 3399a7c..146c1b7 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -2,7 +2,7 @@
Name: openstack-cinder
Version: 2014.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: OpenStack Volume service
Group: Applications/System
@@ -47,7 +47,6 @@ BuildRequires: python-paste-deploy1.5
BuildRequires: python-routes1.12
BuildRequires: python-sqlalchemy0.7
BuildRequires: python-webob1.2
-BuildRequires: crudini
Requires: openstack-utils
Requires: python-cinder = %{version}-%{release}
@@ -174,15 +173,6 @@ sed -i s/REDHATCINDERVERSION/%{version}/ cinder/version.py
sed -i s/REDHATCINDERRELEASE/%{release}/ cinder/version.py
%build
-
-# Move authtoken configuration out of paste.ini
-crudini --del etc/cinder/api-paste.ini filter:authtoken admin_tenant_name
-crudini --del etc/cinder/api-paste.ini filter:authtoken admin_user
-crudini --del etc/cinder/api-paste.ini filter:authtoken admin_password
-crudini --del etc/cinder/api-paste.ini filter:authtoken auth_host
-crudini --del etc/cinder/api-paste.ini filter:authtoken auth_port
-crudini --del etc/cinder/api-paste.ini filter:authtoken auth_protocol
-
%{__python} setup.py build
%install
@@ -320,6 +310,9 @@ fi
%endif
%changelog
+* Tue Apr 29 2014 Alan Pevec <apevec at redhat.com> - 2014.1-3
+- drop crudini build dependency
+
* Mon Apr 21 2014 Eric Harney <eharney at redhat.com> - 2014.1-2
- Remove qpid settings from cinder-dist.conf
More information about the scm-commits
mailing list