summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-01 17:00:21 +0000
committerGerrit Code Review <review@openstack.org>2016-08-01 17:00:21 +0000
commit071da7e880ef940c17fbd90579b48ed702e83876 (patch)
tree64ba8ec3a557368cf9a7ab0046b919666d5d7eb3
parent59603a04b3c0bea8a9411ff8182d8240ea745b6d (diff)
parentf99294ceff6b2d66e047d7b48032347ddc1bd21d (diff)
Merge "Enable keystone to use the SSL middleware"
-rw-r--r--puppet/services/keystone.yaml3
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 48e74875..79c0dcc2 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -110,6 +110,7 @@ outputs:
keystone_signing_certificate: {get_param: KeystoneSigningCertificate}
keystone_ssl_certificate: {get_param: KeystoneSSLCertificate}
keystone_ssl_certificate_key: {get_param: KeystoneSSLCertificateKey}
+ keystone::enable_proxy_headers_parsing: true
keystone::debug: {get_param: Debug}
keystone::db::mysql::password: {get_param: AdminToken}
keystone::rabbit_userid: {get_param: RabbitUserName}
@@ -138,8 +139,6 @@ outputs:
keystone::roles::admin::admin_tenant: 'admin'
keystone::cron::token_flush::destination: '/dev/null'
keystone::config::keystone_config:
- DEFAULT/secure_proxy_ssl_header:
- value: 'HTTP_X_FORWARDED_PROTO'
ec2/driver:
value: 'keystone.contrib.ec2.backends.sql.Ec2'
keystone::service_name: 'httpd'