aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
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/controller.yaml
parent08560a01cf202e15eb622893dc934b191cd55646 (diff)
parent0563ab813628e25fcd284955f94b7161aa8c622e (diff)
Merge "puppet: run keystone in wsgi"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index ea19c711..3554e1e9 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1334,8 +1334,10 @@ resources:
keystone_ssl_certificate: {get_input: keystone_ssl_certificate}
keystone_ssl_certificate_key: {get_input: keystone_ssl_certificate_key}
keystone::database_connection: {get_input: keystone_dsn}
- keystone::public_bind_host: {get_input: keystone_public_api_network}
keystone::admin_bind_host: {get_input: keystone_admin_api_network}
+ keystone::public_bind_host: {get_input: keystone_public_api_network}
+ keystone::wsgi::apache::bind_host: {get_input: keystone_public_api_network}
+ keystone::wsgi::apache::admin_bind_host: {get_input: keystone_admin_api_network}
keystone::debug: {get_input: debug}
keystone::db::mysql::password: {get_input: admin_token}
keystone::rabbit_userid: {get_input: rabbit_username}