Merge lp:~corey.bryant/keystone/2015.1-b2-0ubuntu1 into lp:~ubuntu-server-dev/keystone/kilo

[Corey Bryant]

[lp:~corey.bryant/keystone/2015.1-b2-0ubuntu1]

309. By Corey Bryant on 2015-02-12

Add dash to python-oslo-* dependencies

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-14 16:26:18 +0000
+++ debian/changelog	2015-02-12 17:03:26 +0000
@@ -1,3 +1,14 @@
+keystone (1:2015.1~b2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - d/control: Align with upstream dependencies.
+    - d/p/fix-ubuntu-tests.patch: Dropped. Patched code has been removed.
+    - d/p/sql_connection.patch: Rebased.
+    - d/p/default-log-dir.patch: Rebased.
+    - d/p/add-version-info.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Fri, 06 Feb 2015 09:34:53 -0500
+
 keystone (1:2015.1~b1-0ubuntu3) vivid; urgency=medium
 
   * Rebuild to pick up pkgos upstart generation fix.

=== modified file 'debian/control'
--- debian/control	2015-01-14 15:47:27 +0000
+++ debian/control	2015-02-12 17:03:26 +0000
@@ -12,33 +12,37 @@
  po-debconf,
  python-all (>= 2.6),
  python-babel (>= 1.3),
+ python-bashate (>= 0.2),
+ python-coverage (>= 3.6),
  python-dogpile.cache (>= 0.5.3),
- python-eventlet (>= 0.15.2),
+ python-eventlet (>= 0.16.1),
  python-fixtures (>= 0.3.14),
  python-greenlet (>= 0.3.2),
+ python-hacking (>= 0.10.0),
  python-iso8601 (>= 0.1.9),
  python-jsonschema (>= 2.0.0),
- python-keystoneclient (>= 1:0.11.1),
+ python-keystoneclient (>= 1:1.0.0),
  python-keystonemiddleware (>= 1.0.0),
  python-kombu (>= 2.4.8),
  python-nose,
  python-lockfile (>= 0.8),
  python-ldappool,
- python-lxml,
- python-memcache,
+ python-lxml (>= 2.3),
+ python-memcache (>= 1.48),
  python-migrate (>= 0.9.1),
- python-mock,
- python-netaddr (>= 0.7.6),
+ python-mock (>= 1.0),
+ python-netaddr (>= 0.7.12),
  python-oauthlib (>= 0.6),
- python-oslo.i18n,
- python-oslo.concurrency (>= 0.3.0),
- python-oslo.config (>= 1:1.4.0),
- python-oslo.db (>= 1.1.0),
- python-oslo.messaging (>= 1.4.0),
- python-oslo.serialization (>= 1.0.0),
- python-oslosphinx,
- python-oslotest (>= 1.2.0),
- python-oslo.utils (>= 1.1.0),
+ python-oslo-i18n (>= 1.3.0),
+ python-oslo-concurrency (>= 1.4.1),
+ python-oslo-config (>= 1:1.6.0),
+ python-oslo-db (>= 1.4.1),
+ python-oslo-messaging (>= 1.6.0),
+ python-oslo-middleware (>= 0.3.0),
+ python-oslo-serialization (>= 1.2.0),
+ python-oslosphinx (>= 2.2.0),
+ python-oslotest (>= 1:1.2.0),
+ python-oslo-utils (>= 1.2.0),
  python-passlib,
  python-paste,
  python-pastedeploy (>= 1.5.0),
@@ -46,20 +50,21 @@
  python-pysaml2,
  python-posix-ipc,
  python-pycadf (>= 0.6.0),
- python-pymongo,
+ python-pymongo (>= 2.5),
  python-requests (>= 2.2.0),
  python-routes (>= 1.12.3),
  python-setuptools,
  python-stevedore (>= 1.1.0),
  python-six (>= 1.7.0),
- python-sphinx,
+ python-sphinx (>= 1.1.2),
  python-sqlalchemy (>= 0.9.7),
+ python-sqlite,
  python-testtools (>= 0.9.36),
  python-testscenarios (>= 0.4),
  python-webob (>= 1.2.3),
- python-webtest,
- subunit,
- testrepository
+ python-webtest (>= 2.0),
+ subunit (>= 0.0.18),
+ testrepository (>= 0.0.18),
 Standards-Version: 3.9.6
 XS-Python-Version: >= 2.6
 Homepage: http://launchpad.net/keystone
@@ -73,26 +78,29 @@
 Depends:
  python-babel (>= 1.3),
  python-dogpile.cache (>= 0.5.3),
- python-eventlet (>= 0.15.2),
+ python-eventlet (>= 0.16.1),
  python-greenlet (>= 0.3.2),
  python-iso8601 (>= 0.1.9),
  python-jsonschema (>= 2.0.0),
- python-keystoneclient (>= 1:0.11.1),
+ python-keystoneclient (>= 1:1.0.0),
  python-keystonemiddleware (>= 1.0.0),
  python-kombu (>= 2.4.8),
  python-migrate (>= 0.9.1),
- python-netaddr (>= 0.7.6),
+ python-netaddr (>= 0.7.12),
  python-oauthlib (>= 0.6),
- python-oslo.config (>= 1:1.4.0~a3),
- python-oslo.concurrency (>= 0.3.0),
- python-oslo.messaging (>= 1.4.0~a3),
- python-oslo.db (>= 1.1.0),
- python-oslo.i18n (>= 0.1.0),
- python-oslo.utils (>= 1.1.0),
+ python-oslo-config (>= 1:1.6.0),
+ python-oslo-concurrency (>= 1.4.1),
+ python-oslo-db (>= 1.4.1),
+ python-oslo-i18n (>= 1.3.0),
+ python-oslo-messaging (>= 1.6.0),
+ python-oslo-middleware (>= 0.3.0),
+ python-oslo-serialization (>= 1.2.0),
+ python-oslo-utils (>= 1.2.0),
  python-pam (>= 0.1.4),
  python-passlib,
  python-paste,
- python-pastedeploy,
+ python-pastedeploy (>= 1.5.0),
+ python-pbr (>= 0.6),
  python-posix-ipc,
  python-pycadf (>= 0.6.0),
  python-routes (>= 1.12.3),
@@ -100,7 +108,7 @@
  python-sqlalchemy (>= 0.9.7),
  python-webob (>= 1.2.3),
  python-ldap (>= 2.4),
- python-ldappool,
+ python-ldappool (>= 1.0),
  ${misc:Depends},
  ${python:Depends}
 Suggests: python-memcache

=== modified file 'debian/patches/add-version-info.patch'
--- debian/patches/add-version-info.patch	2015-01-05 14:26:57 +0000
+++ debian/patches/add-version-info.patch	2015-02-12 17:03:26 +0000
@@ -3,10 +3,12 @@
 Forwarded: Not-needed
 --- a/etc/keystone.conf.sample
 +++ b/etc/keystone.conf.sample
-@@ -1616,3 +1616,5 @@ connection=sqlite:////var/lib/keystone/k
- #driver=keystone.trust.backends.sql.Trust
- 
- 
+@@ -1556,3 +1556,7 @@
+ 
+ # Trust backend driver. (string value)
+ #driver = keystone.trust.backends.sql.Trust
++
++
 +[extra_headers]
 +Distribution = Ubuntu
 --- a/keystone/common/config.py
@@ -20,7 +22,7 @@
  from oslo.config import cfg
  from oslo import messaging
  
-@@ -919,6 +921,9 @@ FILE_OPTIONS = {
+@@ -959,6 +961,9 @@
                          'This file should be generated with the '
                          'keystone-manage saml_idp_metadata command.'),
      ],
@@ -32,7 +34,7 @@
  
 --- a/keystone/common/wsgi.py
 +++ b/keystone/common/wsgi.py
-@@ -726,6 +726,11 @@ def render_response(body=None, status=No
+@@ -735,6 +735,11 @@
          headers = list(headers)
      headers.append(('Vary', 'X-Auth-Token'))
  

=== modified file 'debian/patches/default-log-dir.patch'
--- debian/patches/default-log-dir.patch	2015-01-05 14:26:57 +0000
+++ debian/patches/default-log-dir.patch	2015-02-12 17:03:26 +0000
@@ -1,11 +1,10 @@
 --- a/etc/keystone.conf.sample
 +++ b/etc/keystone.conf.sample
-@@ -421,7 +421,7 @@
- # (Optional) The base directory used for relative --log-file
- # paths. (string value)
+@@ -171,6 +171,7 @@
+ # value)
  # Deprecated group/name - [DEFAULT]/logdir
--#log_dir=<None>
-+log_dir=/var/log/keystone
+ #log_dir = <None>
++log_dir = /var/log/keystone
  
- # Use syslog for logging. Existing syslog format is DEPRECATED
- # during I, and will change in J to honor RFC5424. (boolean
+ # Use syslog for logging. Existing syslog format is DEPRECATED during I, and
+ # will change in J to honor RFC5424. (boolean value)

=== removed file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2014-09-29 14:15:47 +0000
+++ debian/patches/fix-ubuntu-tests.patch	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-From 87a0fab930757953c016a883834b24dc11743904 Mon Sep 17 00:00:00 2001
-From: Chuck Short <[e-mail]>
-Date: Fri, 20 Jun 2014 09:11:57 -0400
-Subject: [PATCH] patch
-
-Signed-off-by: Chuck Short <[e-mail]>
----
- keystone/tests/test_keystoneclient.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/keystone/tests/test_keystoneclient.py
-+++ b/keystone/tests/test_keystoneclient.py
-@@ -65,12 +65,12 @@ class CompatTestCase(tests.NoModule, tes
- 
-         self.addCleanup(self.cleanup_instance('public_server', 'admin_server'))
- 
--        if isinstance(self.checkout_info, str):
--            revdir = self.checkout_info
--        else:
--            revdir = tests.checkout_vendor(*self.checkout_info)
--        self.add_path(revdir)
--        self.clear_module('keystoneclient')
-+        #if isinstance(self.checkout_info, str):
-+        #    revdir = self.checkout_info
-+        #else:
-+        #    revdir = tests.checkout_vendor(*self.checkout_info)
-+        #self.add_path(revdir)
-+        #self.clear_module('keystoneclient')
- 
-     def _public_url(self):
-         public_port = self.public_server.socket_info['socket'][1]

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-01-05 14:26:57 +0000
+++ debian/patches/series	2015-02-12 17:03:26 +0000
@@ -1,4 +1,3 @@
-fix-ubuntu-tests.patch
 sql_connection.patch
 ubuntu-test-overrides.patch
 default-log-dir.patch

=== modified file 'debian/patches/sql_connection.patch'
--- debian/patches/sql_connection.patch	2015-01-05 14:26:57 +0000
+++ debian/patches/sql_connection.patch	2015-02-12 17:03:26 +0000
@@ -1,11 +1,10 @@
 --- a/etc/keystone.conf.sample
 +++ b/etc/keystone.conf.sample
-@@ -631,7 +631,7 @@
- # Deprecated group/name - [DEFAULT]/sql_connection
+@@ -569,6 +569,7 @@
  # Deprecated group/name - [DATABASE]/sql_connection
  # Deprecated group/name - [sql]/connection
--#connection=<None>
-+connection=sqlite:////var/lib/keystone/keystone.db
+ #connection = <None>
++connection = sqlite:////var/lib/keystone/keystone.db
  
- # The SQLAlchemy connection string to use to connect to the
- # slave database. (string value)
+ # The SQLAlchemy connection string to use to connect to the slave database.
+ # (string value)