Merge "Enable internal TLS for Barbican API"

[apex-tripleo-heat-templates.git] / puppet / services / horizon.yaml

diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml
index c8ec2b2..cea0c0b 100644 (file)
--- a/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@@ -24,7 +24,8 @@ parameters:
     type: json
   HorizonAllowedHosts:
     default: '*'
-    description: A list of IP/Hostname allowed to connect to horizon
+    description: A list of IP/Hostname for the server Horizonis running on.
+                 Used for header checks.
     type: comma_delimited_list
   HorizonSecret:
     description: Secret key for Django
@@ -62,25 +63,13 @@ outputs:
             dport:
               - 80
               - 443
+        horizon::disable_password_reveal: true
         horizon::cache_backend: django.core.cache.backends.memcached.MemcachedCache
         horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
         horizon::vhost_extra_params:
           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]}