Merge lp:~gandelman-a/ubuntu/raring/keystone/pki_setup into lp:~openstack-ubuntu-testing/keystone/grizzly

Proposed by Adam Gandelman on 2013-03-11
Status: Merged
Merged at revision: 182
Proposed branch: lp:~gandelman-a/ubuntu/raring/keystone/pki_setup
Merge into: lp:~openstack-ubuntu-testing/keystone/grizzly
Diff against target: 34 lines (+7/-2)
2 files modified
debian/changelog (+6/-2)
debian/keystone.postinst (+1/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/raring/keystone/pki_setup
Reviewer Review Type Date Requested Status
James Page 2013-03-11 Approve on 2013-03-14
Review via email: mp+152796@code.launchpad.net

Description of the change

Uses keystone-manage to initialize /etc/keystone/ssl/ for PKI tokens, which is now the default. If we don't want to do enable this by default, we can instead patch keystone.conf and set 'token_format = UUID' to preserve default behavior from <= Folsom.

To post a comment you must log in.
James Page (james-page) wrote :

Sorry - LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-11 13:55:32 +0000
3+++ debian/changelog 2013-03-11 23:16:25 +0000
4@@ -1,4 +1,4 @@
5-keystone (1:2013.1.a231.g0496907-0ubuntu1) UNRELEASED; urgency=low
6+keystone (1:2013.1.a231.g0496907-0ubuntu2) UNRELEASED; urgency=low
7
8 [ James Page ]
9 * d/watch: Update uversionmangle to deal with upstream versioning
10@@ -18,7 +18,11 @@
11 - Dropped python-prettytable no longer needed.
12 * Update standards
13
14- -- James Page <james.page@ubuntu.com> Fri, 01 Mar 2013 14:11:04 +0000
15+ [ Adam Gandelman ]
16+ * debian/keystone.postinst: Run pki_setup during configure to intitialize
17+ PKI infrastructure for signed tokens (now enabled by default).
18+
19+ -- Adam Gandelman <adamg@ubuntu.com> Mon, 11 Mar 2013 16:04:45 -0700
20
21 keystone (2013.1.g3-0ubuntu1) raring; urgency=low
22
23
24=== modified file 'debian/keystone.postinst'
25--- debian/keystone.postinst 2012-12-11 16:12:12 +0000
26+++ debian/keystone.postinst 2013-03-11 23:16:25 +0000
27@@ -21,6 +21,7 @@
28 then
29 su -s /bin/sh -c 'exec keystone-manage db_sync' keystone
30 fi
31+ su -s /bin/sh -c 'exec keystone-manage pki_setup' keystone
32 ;;
33 abort-upgrade)
34 echo "aport upgrade called"

Subscribers

People subscribed via source and target branches