summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-21 13:42:29 +0000
committerGerrit Code Review <review@openstack.org>2015-10-21 13:42:29 +0000
commit42db2b219b0f169b2b48e11f2bc90c6594d53c6e (patch)
treeb32298f7ddf0926f07f704a22ba23aa83785ac7d /puppet/hieradata
parent88efef101e3ce58d2c9e3f53070df936a497b518 (diff)
parent6c6384e901f6e5925ed69738683cf5849d85b7d4 (diff)
Merge "Sync httpd vhost settings in between pcmk and non-pcmk scenarios"
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/controller.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index b659ed78..7972a564 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -92,6 +92,9 @@ pacemaker::resource_defaults::defaults:
# horizon
horizon::cache_backend: django.core.cache.backends.memcached.MemcachedCache
horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
+horizon::vhost_extra_params:
+ add_listen: false
+ priority: 10
# mysql
mysql::server::manage_config_file: true