[openstack-keystone] Update to Icehouse-1

Alan Pevec apevec at fedoraproject.org
Thu Dec 12 19:50:16 UTC 2013


commit b26a5429efe20f9e36eac6fc804a475500c76e3c
Author: Alan Pevec <apevec at redhat.com>
Date:   Thu Dec 12 20:46:18 2013 +0100

    Update to Icehouse-1

 .gitignore                                         |    1 +
 0001-remove-runtime-dep-on-python-pbr.patch        |   27 ++++----
 ...-parameter-values-with-keystone-dist.conf.patch |   14 ++--
 ...role-assignment-adds-role-using-LDAP-assi.patch |   72 --------------------
 openstack-keystone.spec                            |   24 ++++---
 sources                                            |    2 +-
 6 files changed, 36 insertions(+), 104 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 59d6a81..0390676 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /keystone-2013.2.tar.gz
+/keystone-2014.1.b1.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index a9e1bf4..476a1d4 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 7639400e08f067c4d923b20ff4915b41ff2ea0cb Mon Sep 17 00:00:00 2001
+From ab2d3f4aac3d4342e0218f751dbf7f3796488ed6 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 9 Sep 2013 00:38:42 +0200
 Subject: [PATCH] remove runtime dep on python-pbr
@@ -6,14 +6,14 @@ Subject: [PATCH] remove runtime dep on python-pbr
 ---
  bin/keystone-all |  3 +--
  keystone/cli.py  |  3 +--
- requirements.txt | 20 +-------------------
- 3 files changed, 3 insertions(+), 23 deletions(-)
+ requirements.txt | 21 +--------------------
+ 3 files changed, 3 insertions(+), 24 deletions(-)
 
 diff --git a/bin/keystone-all b/bin/keystone-all
-index beec3df..1e6aecb 100755
+index 18e2a1c..2adf940 100755
 --- a/bin/keystone-all
 +++ b/bin/keystone-all
-@@ -32,7 +32,6 @@ if os.path.exists(os.path.join(possible_topdir,
+@@ -33,7 +33,6 @@ if os.path.exists(os.path.join(possible_topdir,
  
  
  from paste import deploy
@@ -21,7 +21,7 @@ index beec3df..1e6aecb 100755
  
  from keystone.openstack.common import gettextutils
  
-@@ -95,7 +94,7 @@ if __name__ == '__main__':
+@@ -101,7 +100,7 @@ if __name__ == '__main__':
          config_files = [dev_conf]
  
      CONF(project='keystone',
@@ -31,7 +31,7 @@ index beec3df..1e6aecb 100755
  
      config.setup_logging(CONF, product_name='keystone')
 diff --git a/keystone/cli.py b/keystone/cli.py
-index af2c2dc..4fd99cf 100644
+index eaf6e10..e42684e 100644
 --- a/keystone/cli.py
 +++ b/keystone/cli.py
 @@ -21,7 +21,6 @@ import os
@@ -52,28 +52,29 @@ index af2c2dc..4fd99cf 100644
           default_config_files=config_files)
      config.setup_logging(CONF)
 diff --git a/requirements.txt b/requirements.txt
-index 9679678..e975d85 100644
+index d7cbb73..e975d85 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,20 +1,2 @@
+@@ -1,21 +1,2 @@
  # keystone dependencies
 -pbr>=0.5.21,<1.0
 -pam>=0.1.4
 -WebOb>=1.2.3,<1.3
 -eventlet>=0.13.0
 -greenlet>=0.3.2
--netaddr
+-netaddr>=0.7.6
 -PasteDeploy>=1.5.0
 -Paste
 -Routes>=1.12.3
+-six>=1.4.1
 -SQLAlchemy>=0.7.8,<=0.7.99
 -sqlalchemy-migrate>=0.7.2
 -passlib
 -lxml>=2.3
--iso8601>=0.1.4
--python-keystoneclient>=0.3.2
+-iso8601>=0.1.8
+-python-keystoneclient>=0.4.1
 -oslo.config>=1.2.0
--Babel>=0.9.6
+-Babel>=1.3
 -oauth2
 -dogpile.cache>=0.5.0
 +# let RPM handle deps
diff --git a/0002-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
index 422a847..b3d3c29 100644
--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,4 +1,4 @@
-From da72fccf6cf0cc427a568211e1670615db20c5eb Mon Sep 17 00:00:00 2001
+From f7fe6fc486cc04ba6815f17f8a5cefca31748daa Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 9 Sep 2013 15:22:20 +0200
 Subject: [PATCH] sync parameter values with keystone-dist.conf
@@ -8,10 +8,10 @@ Subject: [PATCH] sync parameter values with keystone-dist.conf
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
-index d7e1c44..3ead2e0 100644
+index 1910b68..a8b7c2a 100644
 --- a/etc/keystone.conf.sample
 +++ b/etc/keystone.conf.sample
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
  # verbose = False
  
  # Name of log file to output to. If not set, logging will go to stdout.
@@ -20,7 +20,7 @@ index d7e1c44..3ead2e0 100644
  
  # The directory to keep log files in (will be prepended to --logfile)
  # log_dir = /var/log/keystone
-@@ -140,7 +140,7 @@
+@@ -145,7 +145,7 @@
  
  [sql]
  # The SQLAlchemy connection string used to connect to the database
@@ -29,7 +29,7 @@ index d7e1c44..3ead2e0 100644
  
  # the timeout before idle sql connections are reaped
  # idle_timeout = 200
-@@ -188,7 +188,7 @@
+@@ -193,7 +193,7 @@
  # static, file-based backend (does *NOT* support any management commands)
  # driver = keystone.catalog.backends.templated.TemplatedCatalog
  
@@ -38,7 +38,7 @@ index d7e1c44..3ead2e0 100644
  
  [endpoint_filter]
  # extension for creating associations between project and endpoints in order to
-@@ -271,7 +271,7 @@
+@@ -276,7 +276,7 @@
  # driver = keystone.policy.backends.sql.Policy
  
  [ec2]
@@ -47,7 +47,7 @@ index d7e1c44..3ead2e0 100644
  
  [assignment]
  # driver =
-@@ -425,4 +425,4 @@ oauth1 = keystone.auth.plugins.oauth1.OAuth
+@@ -434,4 +434,4 @@ oauth1 = keystone.auth.plugins.oauth1.OAuth
  
  [paste_deploy]
  # Name of the paste configuration file that defines the available pipelines
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index d217a13..d044bfe 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,18 +1,20 @@
 #
-# This is 2013.2 Havana release
+# This is 2014.1 Icehouse-1 milestone
 #
-%global release_name havana
+%global release_name icehouse
+%global milestone 1
 
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:           openstack-keystone
-Version:        2013.2
-Release:        2%{?dist}
+Version:        2014.1
+Release:        0.1.%{milestone}%{?dist}
 Summary:        OpenStack Identity Service
 
 License:        ASL 2.0
 URL:            http://keystone.openstack.org/
-Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
+#Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
+Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.b%{milestone}.tar.gz
 Source1:        openstack-keystone.logrotate
 Source2:        openstack-keystone.service
 Source5:        openstack-keystone-sample-data
@@ -20,11 +22,10 @@ Source20:       keystone-dist.conf
 
 
 #
-# patches_base=2013.2
+# patches_base=2014.1.b1
 #
 Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
 Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
-Patch0003: 0003-Fix-remove-role-assignment-adds-role-using-LDAP-assi.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -35,7 +36,7 @@ BuildRequires:  python-pbr
 BuildRequires:  python-d2to1
 
 Requires:       python-keystone = %{version}-%{release}
-Requires:       python-keystoneclient >= 1:0.3.0
+Requires:       python-keystoneclient >= 1:0.4.1
 
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
@@ -69,7 +70,7 @@ Requires:       python-oslo-config >= 1:1.2.0
 Requires:       openssl
 Requires:       python-netaddr
 Requires:       python-six
-Requires:       python-babel >= 0.9.6
+Requires:       python-babel
 Requires:       python-oauth2
 Requires:       python-dogpile-cache >= 0.5.0
 
@@ -92,11 +93,12 @@ This package contains documentation for Keystone.
 %endif
 
 %prep
-%setup -q -n keystone-%{version}
+%setup -q -n keystone-%{version}.b%{milestone}
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
+
+sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
diff --git a/sources b/sources
index 018ec4e..415b466 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0417878ca3418ac7b552b28330987fac  keystone-2013.2.tar.gz
+c8dd6dcb9eee52c281b034e7f8e34fea  keystone-2014.1.b1.tar.gz


More information about the scm-commits mailing list