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

[Adam Gandelman]

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.

[James Page (james-page)]

Sorry - LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-11 13:55:32 +0000
+++ debian/changelog	2013-03-11 23:16:25 +0000
@@ -1,4 +1,4 @@
-keystone (1:2013.1.a231.g0496907-0ubuntu1) UNRELEASED; urgency=low
+keystone (1:2013.1.a231.g0496907-0ubuntu2) UNRELEASED; urgency=low
 
   [ James Page ]
   * d/watch: Update uversionmangle to deal with upstream versioning
@@ -18,7 +18,11 @@
     - Dropped python-prettytable no longer needed.
    * Update standards 
 
- -- James Page <[e-mail]>  Fri, 01 Mar 2013 14:11:04 +0000
+  [ Adam Gandelman ]
+  * debian/keystone.postinst: Run pki_setup during configure to intitialize
+    PKI infrastructure for signed tokens (now enabled by default).
+
+ -- Adam Gandelman <[e-mail]>  Mon, 11 Mar 2013 16:04:45 -0700
 
 keystone (2013.1.g3-0ubuntu1) raring; urgency=low
 
 
=== modified file 'debian/keystone.postinst'
--- debian/keystone.postinst	2012-12-11 16:12:12 +0000
+++ debian/keystone.postinst	2013-03-11 23:16:25 +0000
@@ -21,6 +21,7 @@
         then
 			su -s /bin/sh -c 'exec keystone-manage db_sync' keystone
 		fi
+		su -s /bin/sh -c 'exec keystone-manage pki_setup' keystone
 		;;
 	abort-upgrade)
 		echo "aport upgrade called"