aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-31 17:05:05 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-31 17:05:05 +0300
commit3d2d6827d8658387a21ad494c324a4cd13da4a6a (patch)
treedc824b98b9fbe8ea556012158a5f1fe931e2ca34
parent1c0df5b42ab17be8a8d256247c77999acb5eecc7 (diff)
Remove repeated apache-related hieradata
This is already set in the apache profile, so we shouldn't be setting it in horizon. Change-Id: I21bd2c6770f871b2940c03d4a2b1cff7d4616346
-rw-r--r--puppet/services/horizon.yaml13
1 files changed, 0 insertions, 13 deletions
diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml
index 1ea686b9..df52ad58 100644
--- a/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@@ -64,19 +64,6 @@ outputs:
add_listen: false
priority: 10
access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
- # NOTE: bind IP is found in Heat replacing the network name with the local node IP
- # for the given network; replacement examples (eg. for internal_api):
- # internal_api -> IP
- # internal_api_uri -> [IP]
- # internal_api_subnet - > IP/CIDR
- apache::ip: {get_param: [ServiceNetMap, HorizonNetwork]}
- apache_remote_proxy_ips_network:
- str_replace:
- template: "NETWORK_subnet"
- params:
- NETWORK: {get_param: [ServiceNetMap, HorizonNetwork]}
- apache::mod::remoteip::proxy_ips:
- - "%{hiera('apache_remote_proxy_ips_network')}"
horizon::bind_address: {get_param: [ServiceNetMap, HorizonNetwork]}
horizon::django_debug: {get_param: Debug}
horizon::keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri]}