Merge "Enable httpd balancing for Horizon"

diff --cc puppet/controller-puppet.yaml
index 953e592,4fdbf61..3d7ecd5
--- 1/puppet/controller-puppet.yaml
--- 2/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@@ -976,9 -969,9 +976,10 @@@ resources
                  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 --cc puppet/manifests/overcloud_controller_pacemaker.pp
Simple merge