From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 22 Jun 2015 09:09:47 +0000 (+0000)
Subject: Merge "Enable httpd balancing for Horizon"
X-Git-Tag: opnfv-6.0.0~2475
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0072ab0903bd59567c75cd9500f94623e1c18581;p=apex-tripleo-heat-templates.git

Merge "Enable httpd balancing for Horizon"
---

0072ab0903bd59567c75cd9500f94623e1c18581
diff --cc puppet/controller-puppet.yaml
index 953e592f,4fdbf61d..3d7ecd58
--- a/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}