diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-09-02 12:19:45 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-09-02 12:19:45 +0000 |
commit | dada8f55bff69fd1d37c34555a2ba58f3c854962 (patch) | |
tree | 4ee5776d8d03a6d3085efc85321db0ca612ee802 | |
parent | 925f624dcc167fb05a74fc371c8fc935b024def4 (diff) | |
parent | 3d2d6827d8658387a21ad494c324a4cd13da4a6a (diff) |
Merge "Remove repeated apache-related hieradata"
-rw-r--r-- | puppet/services/horizon.yaml | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml index c8ec2b2b..6ea5ec4e 100644 --- a/puppet/services/horizon.yaml +++ b/puppet/services/horizon.yaml @@ -68,19 +68,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]} |