From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 21 Oct 2015 13:42:29 +0000 (+0000)
Subject: Merge "Sync httpd vhost settings in between pcmk and non-pcmk scenarios"
X-Git-Tag: opnfv-6.0.0~2343
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=42db2b219b0f169b2b48e11f2bc90c6594d53c6e;p=apex-tripleo-heat-templates.git

Merge "Sync httpd vhost settings in between pcmk and non-pcmk scenarios"
---

42db2b219b0f169b2b48e11f2bc90c6594d53c6e
diff --cc puppet/hieradata/controller.yaml
index b659ed78,a95ea501..7972a564
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@@ -90,8 -90,10 +90,11 @@@ pacemaker::resource_defaults::defaults
    resource-stickiness: { value: INFINITY }
  
  # 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