openstack/charm-keystone
Code Issues Proposed changes

Align templates with sql

Browse Source
This commit is contained in:
James Page 2014-04-02 22:26:48 +01:00
parent eed04f99f3
commit fdfa082ed6
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/essex/keystone.conf
View File

@ -31,7 +31,7 @@ driver = keystone.token.backends.sql.Token
expiration = 86400 expiration = 86400
[policy] [policy]
driver = keystone.policy.backends.rules.Policy driver = keystone.policy.backends.sql.Policy
[ec2] [ec2]
driver = keystone.contrib.ec2.backends.sql.Ec2 driver = keystone.contrib.ec2.backends.sql.Ec2

2
templates/folsom/keystone.conf
View File

@ -31,7 +31,7 @@ driver = keystone.token.backends.sql.Token
expiration = 86400 expiration = 86400
[policy] [policy]
driver = keystone.policy.backends.rules.Policy driver = keystone.policy.backends.sql.Policy
[ec2] [ec2]
driver = keystone.contrib.ec2.backends.sql.Ec2 driver = keystone.contrib.ec2.backends.sql.Ec2

6
templates/grizzly/keystone.conf
View File

@ -31,18 +31,14 @@ driver = keystone.catalog.backends.sql.Catalog
[token] [token]
driver = keystone.token.backends.sql.Token driver = keystone.token.backends.sql.Token
expiration = 86400
[policy] [policy]
driver = keystone.policy.backends.rules.Policy driver = keystone.policy.backends.sql.Policy
[ec2] [ec2]
driver = keystone.contrib.ec2.backends.sql.Ec2 driver = keystone.contrib.ec2.backends.sql.Ec2
[signing] [signing]
token_format = UUID
key_size = 2048
valid_days = 3650
[auth] [auth]
methods = password,token methods = password,token

7
templates/havana/keystone.conf
View File

@ -43,19 +43,16 @@ expiration = 86400
[cache] [cache]
[policy] [policy]
driver = keystone.policy.backends.rules.Policy driver = keystone.policy.backends.sql.Policy
[ec2] [ec2]
driver = keystone.contrib.ec2.backends.kvs.Ec2 driver = keystone.contrib.ec2.backends.sql.Ec2
[assignment] [assignment]
[oauth1] [oauth1]
[signing] [signing]
token_format = UUID
key_size = 2048
valid_days = 3650
[auth] [auth]
methods = external,password,token,oauth1 methods = external,password,token,oauth1

10
templates/icehouse/keystone.conf
View File

@ -1,4 +1,4 @@
# havana # icehouse
############################################################################### ###############################################################################
# [ WARNING ] # [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten. # Configuration file maintained by Juju. Local changes may be overwritten.
@ -38,24 +38,20 @@ driver = keystone.catalog.backends.sql.Catalog
[token] [token]
driver = keystone.token.backends.sql.Token driver = keystone.token.backends.sql.Token
expiration = 86400
[cache] [cache]
[policy] [policy]
driver = keystone.policy.backends.rules.Policy driver = keystone.policy.backends.sql.Policy
[ec2] [ec2]
driver = keystone.contrib.ec2.backends.kvs.Ec2 driver = keystone.contrib.ec2.backends.sql.Ec2
[assignment] [assignment]
[oauth1] [oauth1]
[signing] [signing]
token_format = UUID
key_size = 2048
valid_days = 3650
[auth] [auth]
methods = external,password,token,oauth1 methods = external,password,token,oauth1