Merge "Enable httpd balancing for Horizon"

diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 953e592..3d7ecd5 100644 (file)
--- 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 99ec0e9..2e30f21 100644 (file)
--- 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 de9eac5..cc1b32a 100644 (file)
--- 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')