summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-06 08:06:14 +0000
committerGerrit Code Review <review@openstack.org>2013-07-06 08:06:14 +0000
commit6450f75deffa9a63fc77dbf9d4d35ad7e11feaf2 (patch)
tree57144e6dbf2a2a64c3d1c1ed634065cefabced9a
parent5746f5b2aefca6a93f8295301236b3c4c38611d4 (diff)
parentce9d3c8d92941523188def298962c15814cf984d (diff)
Merge "Update paths to pem files in keystone.conf.sample"
-rw-r--r--etc/keystone.conf.sample16
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index 9a36316d..3f4f1637 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -132,10 +132,10 @@
[ssl]
#enable = True
-#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
+#certfile = /etc/keystone/pki/certs/ssl_cert.pem
+#keyfile = /etc/keystone/pki/private/ssl_key.pem
+#ca_certs = /etc/keystone/pki/certs/cacert.pem
+#ca_key = /etc/keystone/pki/private/cakey.pem
#key_size = 1024
#valid_days = 3650
#ca_password = None
@@ -144,10 +144,10 @@
[signing]
#token_format = PKI
-#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
+#certfile = /etc/keystone/pki/certs/signing_cert.pem
+#keyfile = /etc/keystone/pki/private/signing_key.pem
+#ca_certs = /etc/keystone/pki/certs/cacert.pem
+#ca_key = /etc/keystone/pki/private/cakey.pem
#key_size = 2048
#valid_days = 3650
#ca_password = None