Merge "Remove repeated apache-related hieradata"

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]}