diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-22 09:09:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-22 09:09:47 +0000 |
| commit | 0072ab0903bd59567c75cd9500f94623e1c18581 (patch) | |
| tree | 68efb8a9597064343ccd50c4920c51d96da02f41 | |
| parent | 882ee42f4a35010259c6f2bec1847946e76f3718 (diff) | |
| parent | 6e6c7e54f9daa77cdbb6534785c5a411f3a102de (diff) | |
Merge "Enable httpd balancing for Horizon"
| -rw-r--r-- | puppet/controller-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 9 |
3 files changed, 8 insertions, 3 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 953e592f..3d7ecd58 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -979,6 +979,7 @@ resources: nova::vncproxy::host: {get_input: nova_api_network} # 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 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') |