Merge lp:~gnuoy/charms/trusty/keystone/token-expiry into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Liam Young]

=== modified file 'config.yaml'
--- config.yaml	2015-02-19 04:18:24 +0000
+++ config.yaml	2015-04-01 06:55:51 +0000
@@ -62,10 +62,10 @@
     default: 'Admin'
     type: string
     description: 'Admin role to be associated with admin and service users'
-  token-expiry:
-    default: "2017-02-05T00:00"
-    type: string
-    description: "Expiration date of generated admin tokens"
+  token-expiration:
+    default: 3600
+    type: int
+    description: "Amount of time a token should remain valid (in seconds)."
   service-tenant:
     default: "services"
     type: string

=== modified file 'hooks/keystone_context.py'
--- hooks/keystone_context.py	2015-03-18 13:48:33 +0000
+++ hooks/keystone_context.py	2015-04-01 06:55:51 +0000
@@ -202,6 +202,7 @@
         ctxt['debug'] = debug and bool_from_string(debug)
         verbose = config('verbose')
         ctxt['verbose'] = verbose and bool_from_string(verbose)
+        ctxt['token_expiration'] = config('token-expiration')
 
         ctxt['identity_backend'] = config('identity-backend')
         ctxt['assignment_backend'] = config('assignment-backend')

=== modified file 'templates/icehouse/keystone.conf'
--- templates/icehouse/keystone.conf	2015-02-18 17:20:23 +0000
+++ templates/icehouse/keystone.conf	2015-04-01 06:55:51 +0000
@@ -49,7 +49,8 @@
 provider = keystone.token.providers.pkiz.Provider
 {% else -%}
 provider = keystone.token.providers.uuid.Provider 
-{% endif %}
+{% endif -%}
+expiration = {{ token_expiration }}
 
 {% include "parts/section-signing" %}
 

=== modified file 'templates/kilo/keystone.conf'
--- templates/kilo/keystone.conf	2015-03-24 09:53:00 +0000
+++ templates/kilo/keystone.conf	2015-04-01 06:55:51 +0000
@@ -46,6 +46,7 @@
 [token]
 driver = keystone.token.persistence.backends.sql.Token
 provider = keystone.token.providers.uuid.Provider
+expiration = {{ token_expiration }}
 
 [cache]