aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-06-17 22:04:16 +0200
committerGiulio Fidente <gfidente@redhat.com>2015-06-18 15:42:50 +0200
commit6e6c7e54f9daa77cdbb6534785c5a411f3a102de (patch)
tree46216d58cdd30a17adb5cc91e4fda346ef24262d
parent63af3fcbe90158ce1a3f96d35219805d902c25f4 (diff)
Enable httpd balancing for Horizon
We need to customize the default apache::ip param or the default vhost configured will listen on ::80 Change-Id: I195a083f727da940841beb3a0c37dade02c6d1ca
-rw-r--r--puppet/controller-puppet.yaml1
-rw-r--r--puppet/hieradata/controller.yaml1
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp9
3 files changed, 8 insertions, 3 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 67a11f00..4fdbf61d 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -971,6 +971,7 @@ resources:
nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url}
# Horizon
+ apache::ip: {get_input: horizon_network}
horizon::django_debug: {get_input: debug}
horizon::secret_key: {get_input: horizon_secret}
horizon::bind_address: {get_input: horizon_network}
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 99ec0e91..2e30f211 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -114,3 +114,4 @@ tripleo::loadbalancer::ceilometer: true
tripleo::loadbalancer::heat_api: true
tripleo::loadbalancer::heat_cloudwatch: true
tripleo::loadbalancer::heat_cfn: true
+tripleo::loadbalancer::horizon: true
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 4ef395f2..2b6559d6 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -719,14 +719,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')