aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-22 09:09:47 +0000
committerGerrit Code Review <review@openstack.org>2015-06-22 09:09:47 +0000
commit0072ab0903bd59567c75cd9500f94623e1c18581 (patch)
tree68efb8a9597064343ccd50c4920c51d96da02f41 /puppet/manifests
parent882ee42f4a35010259c6f2bec1847946e76f3718 (diff)
parent6e6c7e54f9daa77cdbb6534785c5a411f3a102de (diff)
Merge "Enable httpd balancing for Horizon"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp9
1 files changed, 6 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index de9eac51..cc1b32a9 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -718,14 +718,17 @@ if hiera('step') >= 3 {
}
# httpd/apache and horizon
+ # NOTE(gfidente): server-status can be consumed by the pacemaker resource agent
include ::apache
- class { '::apache::mod::status':
- allow_from => ['127.0.0.1'],
+ include ::apache::mod::status
+ $vhost_params = {
+ add_listen => false,
+ priority => 10,
}
- $vhost_params = { add_listen => false }
class { 'horizon':
cache_server_ip => hiera('memcache_node_ips', '127.0.0.1'),
vhost_extra_params => $vhost_params,
+ server_aliases => $::hostname,
}
$snmpd_user = hiera('snmpd_readonly_user_name')