summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-11 06:15:18 +0000
committerGerrit Code Review <review@openstack.org>2013-06-11 06:15:18 +0000
commit7187248fb7cdd6ba1cb344f527da428928e46314 (patch)
treeccfa4010addd0d955a9ef5b476692bdf9dceac46 /etc
parent91a7370b6bac6b45c2bfbae6ec4921e4f99442d1 (diff)
parentcef5dec5bf4a6446946d2271d5c99b5d5160ae1a (diff)
downloadkeystone-7187248fb7cdd6ba1cb344f527da428928e46314.tar.gz
keystone-7187248fb7cdd6ba1cb344f527da428928e46314.tar.xz
keystone-7187248fb7cdd6ba1cb344f527da428928e46314.zip
Merge "add ca_key to sample configuration"
Diffstat (limited to 'etc')
-rw-r--r--etc/keystone.conf.sample2
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index 8a1e3fb2..f65eab5b 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -135,6 +135,7 @@
#certfile = /etc/keystone/ssl/certs/keystone.pem
#keyfile = /etc/keystone/ssl/private/keystonekey.pem
#ca_certs = /etc/keystone/ssl/certs/ca.pem
+#ca_key = /etc/keystone/ssl/certs/cakey.pem
#key_size = 1024
#valid_days = 3650
#ca_password = None
@@ -146,6 +147,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
+#ca_key = /etc/keystone/ssl/certs/cakey.pem
#key_size = 2048
#valid_days = 3650
#ca_password = None