From b27cc34d8b8787b30e856b427fd03ca462661ac8 Mon Sep 17 00:00:00 2001
From: Lokesh Jain <lokesh.jain@gmail.com>
Date: Tue, 10 Oct 2017 17:54:58 -0400
Subject: [PATCH] Make Horizon parameters: vhost_extra_params and
 customization_module configurable

Horizon parameters - horizon::vhost_extra_params and horizon::customization_module
are available but not configurable using horizon. This change exposes these parameters
and makes them configurable.

Depends-On: Id204b60b2676f49713fb6ce7eede6200221f7163
Change-Id: I4875585530c6d1d3b1134577ef2e097216c6c348
---
 puppet/services/horizon.yaml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml
index 642a0f099e..0b6d45939d 100644
--- a/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@@ -75,6 +75,17 @@ parameters:
     type: string
     description: Specifies the default CA cert to use if TLS is used for
                  services in the internal network.
+  HorizonVhostExtraParams:
+    default:
+      priority: 10
+      access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
+      options: ['FollowSymLinks','MultiViews']
+    description: Extra parameters for Horizon vhost configuration
+    type: json
+  HorizonCustomizationModule:
+    default: ''
+    description: Horizon has a global overrides mechanism available to perform customizations
+    type: string
 
 conditions:
 
@@ -100,10 +111,7 @@ outputs:
           horizon::disallow_iframe_embed: true
           horizon::cache_backend: django.core.cache.backends.memcached.MemcachedCache
           horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
-          horizon::vhost_extra_params:
-            priority: 10
-            access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
-            options: ['FollowSymLinks','MultiViews']
+          horizon::vhost_extra_params: {get_param: HorizonVhostExtraParams}
           horizon::bind_address: {get_param: [ServiceNetMap, HorizonNetwork]}
           horizon::keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
           horizon::password_validator: {get_param: [HorizonPasswordValidator]}
@@ -125,6 +133,7 @@ outputs:
                 $NETWORK: {get_param: [ServiceNetMap, HorizonNetwork]}
           horizon::listen_ssl: {get_param: EnableInternalTLS}
           horizon::horizon_ca: {get_param: InternalTLSCAFile}
+          horizon::customization_module: {get_param: HorizonCustomizationModule}
         -
           if:
           - debug_unset