Merge "Enable httpd balancing for Horizon"

diff --combined puppet/controller-puppet.yaml
index 953e592,4fdbf61..3d7ecd5
--- 1/puppet/controller-puppet.yaml
--- 2/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@@ -691,12 -691,6 +691,12 @@@ resources
          ceilometer_backend: {get_param: CeilometerBackend}
          ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
          ceilometer_password: {get_param: CeilometerPassword}
 +        ceilometer_coordination_url:
 +          list_join:
 +            - ''
 +            - - 'redis://'
 +              - {get_param: RedisVirtualIP}
 +              - ':6379'
          ceilometer_dsn:
            list_join:
              - ''
@@@ -753,7 -747,7 +753,7 @@@
          keystone_admin_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
          mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
          neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
 -        neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronLocalIp]}]}
 +        neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
          ceilometer_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
          nova_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
          nova_metadata_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaMetadataNetwork]}]}
@@@ -955,7 -949,6 +955,7 @@@
                  ceilometer::api::keystone_identity_uri: {get_input: keystone_identity_uri}
                  ceilometer::agent::auth::auth_password: {get_input: ceilometer_password}
                  ceilometer::agent::auth::auth_url: {get_input: keystone_auth_address}
 +                ceilometer::agent::central::coordination_url: {get_input: ceilometer_coordination_url}
                  snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
                  snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
  
@@@ -976,9 -969,9 +976,10 @@@
                  nova::network::neutron::neutron_admin_password: {get_input: neutron_password}
                  nova::network::neutron::neutron_url: {get_input: neutron_url}
                  nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url}
 +                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 --combined puppet/manifests/overcloud_controller_pacemaker.pp
index de9eac5,2b6559d..cc1b32a
--- 1/puppet/manifests/overcloud_controller_pacemaker.pp
--- 2/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@@ -55,7 -55,7 +55,7 @@@ if hiera('step') >= 1 
    class { '::tripleo::loadbalancer' :
      controller_hosts       => $controller_node_ips,
      controller_hosts_names => $controller_node_names,
 -    redis                  => false,
 +    redis                  => true,
      manage_vip             => false,
      haproxy_service_manage => false,
    }
@@@ -674,6 -674,7 +674,6 @@@ if hiera('step') >= 3 
    class { '::ceilometer::agent::central' :
      manage_service => false,
      enabled => false,
 -    coordination_url => "redis://${redis_vip}:6379",
    }
    class { '::ceilometer::alarm::notifier' :
      manage_service => false,
@@@ -718,14 -719,17 +718,17 @@@
    }
  
    # 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')