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 df52ad5..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
@@ -40,12 +41,16 @@ parameters:
     default: false
     description: Enable IPv6 features in Memcached.
     type: boolean
+  MonitoringSubscriptionHorizon:
+    default: 'overcloud-horizon'
+    type: string
 
 outputs:
   role_data:
     description: Role data for the Horizon role.
     value:
       service_name: horizon
+      monitoring_subscription: {get_param: MonitoringSubscriptionHorizon}
       config_settings:
         horizon::allowed_hosts: {get_param: HorizonAllowedHosts}
         neutron::plugins::ml2::mechanism_drivers:
@@ -58,6 +63,7 @@ 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: