summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-10-15 18:30:42 +0200
committerGiulio Fidente <gfidente@redhat.com>2015-10-15 18:30:42 +0200
commit6c6384e901f6e5925ed69738683cf5849d85b7d4 (patch)
treec455b716f96aea166f0d68408a2fe2cc22e8a67f /puppet/hieradata
parente161d63e0f5d2c2e6f4b0f52449d6a4b5e1d8ea0 (diff)
Sync httpd vhost settings in between pcmk and non-pcmk scenarios
Moves the vhost_params out of the manifest and into static hiera; also removes unneeded server_alias parameter as that matched the vhost servername anyway. Change-Id: I4b5971b23ef3be9529a59075fa93ccc64af75b9c
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 90c2705f..a95ea501 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -91,6 +91,9 @@ pacemaker::resource_defaults::defaults:
# horizon
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