summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-11 20:22:31 +0000
committerGerrit Code Review <review@openstack.org>2016-02-11 20:22:31 +0000
commit5e20d081de48cbacad93dbd5a4434835bc09ac60 (patch)
treebde539878e4c6d646cb8a4a9eac2ba9c963f018e /puppet/hieradata
parent08560a01cf202e15eb622893dc934b191cd55646 (diff)
parent0563ab813628e25fcd284955f94b7161aa8c622e (diff)
Merge "puppet: run keystone in wsgi"
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/controller.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index d2ca9bea..13f4eec7 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -52,6 +52,8 @@ keystone::config::keystone_config:
value: 'HTTP_X_FORWARDED_PROTO'
ec2/driver:
value: 'keystone.contrib.ec2.backends.sql.Ec2'
+keystone::service_name: 'httpd'
+keystone::wsgi::apache::ssl: false
#swift
swift::proxy::pipeline: