X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fhorizon.yaml;h=e59dc202edf90550dddb17a36bd3ac60fe180cfd;hb=22ba81cf9dd8b2690c3e8c0eee5a70dcb37e10c4;hp=c5d96819622fd96349ec5990995700eadc81d97f;hpb=c58ed3b63e0c3bf56f58553af31afe5018f31695;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml
index c5d96819..e59dc202 100644
--- a/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: 2016-10-14
 
 description: >
   Horizon service configured with Puppet
@@ -10,6 +10,10 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
+  Debug:
+    default: ''
+    description: Set to True to enable debugging on all services.
+    type: string
   DefaultPasswords:
     default: {}
     type: json
@@ -20,36 +24,64 @@ parameters:
     type: json
   HorizonAllowedHosts:
     default: '*'
-    description: A list of IP/Hostname allowed to connect to horizon
-    type: comma_delimited_list
-  NeutronMechanismDrivers:
-    default: 'openvswitch'
-    description: |
-        The mechanism drivers for the Neutron tenant network.
+    description: A list of IP/Hostname for the server Horizon is running on.
+                 Used for header checks.
     type: comma_delimited_list
+  HorizonSecret:
+    description: Secret key for Django
+    type: string
+    hidden: true
+    default: ''
+  MemcachedIPv6:
+    default: false
+    description: Enable IPv6 features in Memcached.
+    type: boolean
+  MonitoringSubscriptionHorizon:
+    default: 'overcloud-horizon'
+    type: string
+
+conditions:
+
+  debug_empty: {equals : [{get_param: Debug}, '']}
 
 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:
-          str_replace:
-            template: MECHANISMS
-            params:
-              MECHANISMS: {get_param: NeutronMechanismDrivers}
-        tripleo.horizon.firewall_rules:
-          '126 horizon':
-            dport:
-              - 80
-              - 443
-        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\"'
+        map_merge:
+        - horizon::allowed_hosts: {get_param: HorizonAllowedHosts}
+          tripleo.horizon.firewall_rules:
+            '126 horizon':
+              dport:
+                - 80
+                - 443
+          horizon::enable_secure_proxy_ssl_header: true
+          horizon::disable_password_reveal: true
+          horizon::enforce_password_check: 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\"'
+            options: ['FollowSymLinks','MultiViews']
+          horizon::bind_address: {get_param: [ServiceNetMap, HorizonNetwork]}
+          horizon::keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
+          horizon::secret_key:
+            yaql:
+              expression: $.data.passwords.where($ != '').first()
+              data:
+                passwords:
+                  - {get_param: HorizonSecret}
+                  - {get_param: [DefaultPasswords, horizon_secret]}
+          memcached_ipv6: {get_param: MemcachedIPv6}
+        -
+          if:
+          - debug_empty
+          - {}
+          - horizon::django_debug: {get_param: Debug}
       step_config: |
         include ::tripleo::profile::base::horizon