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

diff --cc puppet/hieradata/controller.yaml
index b659ed7,a95ea50..7972a56
--- 1/puppet/hieradata/controller.yaml
--- 2/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