OpenStack Identity (keystone)

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

  1. 2015.1-b2-0ubuntu1
  2. Merge into kilo
Proposed by Corey Bryant
Status: Merged
Merged at revision: 308
Proposed branch: lp:~corey.bryant/keystone/2015.1-b2-0ubuntu1
Merge into: lp:~ubuntu-server-dev/keystone/kilo
Diff against target: 278 lines (+69/-82)
7 files modified
debian/changelog (+11/-0)
debian/control (+39/-31)
debian/patches/add-version-info.patch (+8/-6)
debian/patches/default-log-dir.patch (+6/-7)
debian/patches/fix-ubuntu-tests.patch (+0/-31)
debian/patches/series (+0/-1)
debian/patches/sql_connection.patch (+5/-6)
To merge this branch: bzr merge lp:~corey.bryant/keystone/2015.1-b2-0ubuntu1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+249525@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/keystone/2015.1-b2-0ubuntu1 updated
309. By Corey Bryant

Add dash to python-oslo-* dependencies

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1keystone (1:2015.1~b2-0ubuntu1) UNRELEASED; urgency=medium
2
3 * New upstream release.
4 - d/control: Align with upstream dependencies.
5 - d/p/fix-ubuntu-tests.patch: Dropped. Patched code has been removed.
6 - d/p/sql_connection.patch: Rebased.
7 - d/p/default-log-dir.patch: Rebased.
8 - d/p/add-version-info.patch: Rebased.
9
10 -- Corey Bryant <corey.bryant@canonical.com> Fri, 06 Feb 2015 09:34:53 -0500
11
1keystone (1:2015.1~b1-0ubuntu3) vivid; urgency=medium12keystone (1:2015.1~b1-0ubuntu3) vivid; urgency=medium
213
3 * Rebuild to pick up pkgos upstart generation fix.14 * Rebuild to pick up pkgos upstart generation fix.
415
=== 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 @@
12 po-debconf,12 po-debconf,
13 python-all (>= 2.6),13 python-all (>= 2.6),
14 python-babel (>= 1.3),14 python-babel (>= 1.3),
15 python-bashate (>= 0.2),
16 python-coverage (>= 3.6),
15 python-dogpile.cache (>= 0.5.3),17 python-dogpile.cache (>= 0.5.3),
16 python-eventlet (>= 0.15.2),18 python-eventlet (>= 0.16.1),
17 python-fixtures (>= 0.3.14),19 python-fixtures (>= 0.3.14),
18 python-greenlet (>= 0.3.2),20 python-greenlet (>= 0.3.2),
21 python-hacking (>= 0.10.0),
19 python-iso8601 (>= 0.1.9),22 python-iso8601 (>= 0.1.9),
20 python-jsonschema (>= 2.0.0),23 python-jsonschema (>= 2.0.0),
21 python-keystoneclient (>= 1:0.11.1),24 python-keystoneclient (>= 1:1.0.0),
22 python-keystonemiddleware (>= 1.0.0),25 python-keystonemiddleware (>= 1.0.0),
23 python-kombu (>= 2.4.8),26 python-kombu (>= 2.4.8),
24 python-nose,27 python-nose,
25 python-lockfile (>= 0.8),28 python-lockfile (>= 0.8),
26 python-ldappool,29 python-ldappool,
27 python-lxml,30 python-lxml (>= 2.3),
28 python-memcache,31 python-memcache (>= 1.48),
29 python-migrate (>= 0.9.1),32 python-migrate (>= 0.9.1),
30 python-mock,33 python-mock (>= 1.0),
31 python-netaddr (>= 0.7.6),34 python-netaddr (>= 0.7.12),
32 python-oauthlib (>= 0.6),35 python-oauthlib (>= 0.6),
33 python-oslo.i18n,36 python-oslo-i18n (>= 1.3.0),
34 python-oslo.concurrency (>= 0.3.0),37 python-oslo-concurrency (>= 1.4.1),
35 python-oslo.config (>= 1:1.4.0),38 python-oslo-config (>= 1:1.6.0),
36 python-oslo.db (>= 1.1.0),39 python-oslo-db (>= 1.4.1),
37 python-oslo.messaging (>= 1.4.0),40 python-oslo-messaging (>= 1.6.0),
38 python-oslo.serialization (>= 1.0.0),41 python-oslo-middleware (>= 0.3.0),
39 python-oslosphinx,42 python-oslo-serialization (>= 1.2.0),
40 python-oslotest (>= 1.2.0),43 python-oslosphinx (>= 2.2.0),
41 python-oslo.utils (>= 1.1.0),44 python-oslotest (>= 1:1.2.0),
45 python-oslo-utils (>= 1.2.0),
42 python-passlib,46 python-passlib,
43 python-paste,47 python-paste,
44 python-pastedeploy (>= 1.5.0),48 python-pastedeploy (>= 1.5.0),
@@ -46,20 +50,21 @@
46 python-pysaml2,50 python-pysaml2,
47 python-posix-ipc,51 python-posix-ipc,
48 python-pycadf (>= 0.6.0),52 python-pycadf (>= 0.6.0),
49 python-pymongo,53 python-pymongo (>= 2.5),
50 python-requests (>= 2.2.0),54 python-requests (>= 2.2.0),
51 python-routes (>= 1.12.3),55 python-routes (>= 1.12.3),
52 python-setuptools,56 python-setuptools,
53 python-stevedore (>= 1.1.0),57 python-stevedore (>= 1.1.0),
54 python-six (>= 1.7.0),58 python-six (>= 1.7.0),
55 python-sphinx,59 python-sphinx (>= 1.1.2),
56 python-sqlalchemy (>= 0.9.7),60 python-sqlalchemy (>= 0.9.7),
61 python-sqlite,
57 python-testtools (>= 0.9.36),62 python-testtools (>= 0.9.36),
58 python-testscenarios (>= 0.4),63 python-testscenarios (>= 0.4),
59 python-webob (>= 1.2.3),64 python-webob (>= 1.2.3),
60 python-webtest,65 python-webtest (>= 2.0),
61 subunit,66 subunit (>= 0.0.18),
62 testrepository67 testrepository (>= 0.0.18),
63Standards-Version: 3.9.668Standards-Version: 3.9.6
64XS-Python-Version: >= 2.669XS-Python-Version: >= 2.6
65Homepage: http://launchpad.net/keystone70Homepage: http://launchpad.net/keystone
@@ -73,26 +78,29 @@
73Depends:78Depends:
74 python-babel (>= 1.3),79 python-babel (>= 1.3),
75 python-dogpile.cache (>= 0.5.3),80 python-dogpile.cache (>= 0.5.3),
76 python-eventlet (>= 0.15.2),81 python-eventlet (>= 0.16.1),
77 python-greenlet (>= 0.3.2),82 python-greenlet (>= 0.3.2),
78 python-iso8601 (>= 0.1.9),83 python-iso8601 (>= 0.1.9),
79 python-jsonschema (>= 2.0.0),84 python-jsonschema (>= 2.0.0),
80 python-keystoneclient (>= 1:0.11.1),85 python-keystoneclient (>= 1:1.0.0),
81 python-keystonemiddleware (>= 1.0.0),86 python-keystonemiddleware (>= 1.0.0),
82 python-kombu (>= 2.4.8),87 python-kombu (>= 2.4.8),
83 python-migrate (>= 0.9.1),88 python-migrate (>= 0.9.1),
84 python-netaddr (>= 0.7.6),89 python-netaddr (>= 0.7.12),
85 python-oauthlib (>= 0.6),90 python-oauthlib (>= 0.6),
86 python-oslo.config (>= 1:1.4.0~a3),91 python-oslo-config (>= 1:1.6.0),
87 python-oslo.concurrency (>= 0.3.0),92 python-oslo-concurrency (>= 1.4.1),
88 python-oslo.messaging (>= 1.4.0~a3),93 python-oslo-db (>= 1.4.1),
89 python-oslo.db (>= 1.1.0),94 python-oslo-i18n (>= 1.3.0),
90 python-oslo.i18n (>= 0.1.0),95 python-oslo-messaging (>= 1.6.0),
91 python-oslo.utils (>= 1.1.0),96 python-oslo-middleware (>= 0.3.0),
97 python-oslo-serialization (>= 1.2.0),
98 python-oslo-utils (>= 1.2.0),
92 python-pam (>= 0.1.4),99 python-pam (>= 0.1.4),
93 python-passlib,100 python-passlib,
94 python-paste,101 python-paste,
95 python-pastedeploy,102 python-pastedeploy (>= 1.5.0),
103 python-pbr (>= 0.6),
96 python-posix-ipc,104 python-posix-ipc,
97 python-pycadf (>= 0.6.0),105 python-pycadf (>= 0.6.0),
98 python-routes (>= 1.12.3),106 python-routes (>= 1.12.3),
@@ -100,7 +108,7 @@
100 python-sqlalchemy (>= 0.9.7),108 python-sqlalchemy (>= 0.9.7),
101 python-webob (>= 1.2.3),109 python-webob (>= 1.2.3),
102 python-ldap (>= 2.4),110 python-ldap (>= 2.4),
103 python-ldappool,111 python-ldappool (>= 1.0),
104 ${misc:Depends},112 ${misc:Depends},
105 ${python:Depends}113 ${python:Depends}
106Suggests: python-memcache114Suggests: python-memcache
107115
=== 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 @@
3Forwarded: Not-needed3Forwarded: Not-needed
4--- a/etc/keystone.conf.sample4--- a/etc/keystone.conf.sample
5+++ b/etc/keystone.conf.sample5+++ b/etc/keystone.conf.sample
6@@ -1616,3 +1616,5 @@ connection=sqlite:////var/lib/keystone/k6@@ -1556,3 +1556,7 @@
7 #driver=keystone.trust.backends.sql.Trust7
8 8 # Trust backend driver. (string value)
9 9 #driver = keystone.trust.backends.sql.Trust
10+
11+
10+[extra_headers]12+[extra_headers]
11+Distribution = Ubuntu13+Distribution = Ubuntu
12--- a/keystone/common/config.py14--- a/keystone/common/config.py
@@ -20,7 +22,7 @@
20 from oslo.config import cfg22 from oslo.config import cfg
21 from oslo import messaging23 from oslo import messaging
22 24
23@@ -919,6 +921,9 @@ FILE_OPTIONS = {25@@ -959,6 +961,9 @@
24 'This file should be generated with the '26 'This file should be generated with the '
25 'keystone-manage saml_idp_metadata command.'),27 'keystone-manage saml_idp_metadata command.'),
26 ],28 ],
@@ -32,7 +34,7 @@
32 34
33--- a/keystone/common/wsgi.py35--- a/keystone/common/wsgi.py
34+++ b/keystone/common/wsgi.py36+++ b/keystone/common/wsgi.py
35@@ -726,6 +726,11 @@ def render_response(body=None, status=No37@@ -735,6 +735,11 @@
36 headers = list(headers)38 headers = list(headers)
37 headers.append(('Vary', 'X-Auth-Token'))39 headers.append(('Vary', 'X-Auth-Token'))
38 40
3941
=== 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 @@
1--- a/etc/keystone.conf.sample1--- a/etc/keystone.conf.sample
2+++ b/etc/keystone.conf.sample2+++ b/etc/keystone.conf.sample
3@@ -421,7 +421,7 @@3@@ -171,6 +171,7 @@
4 # (Optional) The base directory used for relative --log-file4 # value)
5 # paths. (string value)
6 # Deprecated group/name - [DEFAULT]/logdir5 # Deprecated group/name - [DEFAULT]/logdir
7-#log_dir=<None>6 #log_dir = <None>
8+log_dir=/var/log/keystone7+log_dir = /var/log/keystone
9 8
10 # Use syslog for logging. Existing syslog format is DEPRECATED9 # Use syslog for logging. Existing syslog format is DEPRECATED during I, and
11 # during I, and will change in J to honor RFC5424. (boolean10 # will change in J to honor RFC5424. (boolean value)
1211
=== 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 @@
1From 87a0fab930757953c016a883834b24dc11743904 Mon Sep 17 00:00:00 2001
2From: Chuck Short <chuck.short@canonical.com>
3Date: Fri, 20 Jun 2014 09:11:57 -0400
4Subject: [PATCH] patch
5
6Signed-off-by: Chuck Short <chuck.short@canonical.com>
7---
8 keystone/tests/test_keystoneclient.py | 12 ++++++------
9 1 file changed, 6 insertions(+), 6 deletions(-)
10
11--- a/keystone/tests/test_keystoneclient.py
12+++ b/keystone/tests/test_keystoneclient.py
13@@ -65,12 +65,12 @@ class CompatTestCase(tests.NoModule, tes
14
15 self.addCleanup(self.cleanup_instance('public_server', 'admin_server'))
16
17- if isinstance(self.checkout_info, str):
18- revdir = self.checkout_info
19- else:
20- revdir = tests.checkout_vendor(*self.checkout_info)
21- self.add_path(revdir)
22- self.clear_module('keystoneclient')
23+ #if isinstance(self.checkout_info, str):
24+ # revdir = self.checkout_info
25+ #else:
26+ # revdir = tests.checkout_vendor(*self.checkout_info)
27+ #self.add_path(revdir)
28+ #self.clear_module('keystoneclient')
29
30 def _public_url(self):
31 public_port = self.public_server.socket_info['socket'][1]
320
=== 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 @@
1fix-ubuntu-tests.patch
2sql_connection.patch1sql_connection.patch
3ubuntu-test-overrides.patch2ubuntu-test-overrides.patch
4default-log-dir.patch3default-log-dir.patch
54
=== 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 @@
1--- a/etc/keystone.conf.sample1--- a/etc/keystone.conf.sample
2+++ b/etc/keystone.conf.sample2+++ b/etc/keystone.conf.sample
3@@ -631,7 +631,7 @@3@@ -569,6 +569,7 @@
4 # Deprecated group/name - [DEFAULT]/sql_connection
5 # Deprecated group/name - [DATABASE]/sql_connection4 # Deprecated group/name - [DATABASE]/sql_connection
6 # Deprecated group/name - [sql]/connection5 # Deprecated group/name - [sql]/connection
7-#connection=<None>6 #connection = <None>
8+connection=sqlite:////var/lib/keystone/keystone.db7+connection = sqlite:////var/lib/keystone/keystone.db
9 8
10 # The SQLAlchemy connection string to use to connect to the9 # The SQLAlchemy connection string to use to connect to the slave database.
11 # slave database. (string value)10 # (string value)

Subscribers

People subscribed via source and target branches