summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2012-07-30 23:22:21 -0400
committerDan Prince <dprince@redhat.com>2012-07-31 09:57:12 -0400
commitbc12215b2fec371b543ed671cb4ae02c3f77aa5b (patch)
tree6778f3d4902c7a060339b0b84b3dd5e49729c413
parent0f77f751447ab2a1e2f4dc715aef07233e1669ef (diff)
Set example key_size to 1024.
Updates the default key_size and config file example to 1024. Using the previous value of 2048 would cause database truncation and/or column size errors because the 'id' column isn't big enough to hold that much data. Works around LP Bug #1031191. Change-Id: Ic28bf0945a65fb80a4b610a4de7afa485d09e2bb
-rw-r--r--etc/keystone.conf.sample2
-rw-r--r--keystone/config.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index e98c22d1..b189de05 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -95,7 +95,7 @@
#certfile = /etc/keystone/ssl/certs/signing_cert.pem
#keyfile = /etc/keystone/ssl/private/signing_key.pem
#ca_certs = /etc/keystone/ssl/certs/ca.pem
-#key_size = 2048
+#key_size = 1024
#valid_days = 3650
#ca_password = None
diff --git a/keystone/config.py b/keystone/config.py
index 8954d36b..93481065 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -133,7 +133,7 @@ register_str('keyfile', group='signing',
default="/etc/keystone/ssl/private/signing_key.pem")
register_str('ca_certs', group='signing',
default="/etc/keystone/ssl/certs/ca.pem")
-register_int('key_size', group='signing', default=2048)
+register_int('key_size', group='signing', default=1024)
register_int('valid_days', group='signing', default=3650)
register_str('ca_password', group='signing', default=None)