From 995cf7105759689d72b1664726ab02a69fe1864d Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 14 Feb 2018 18:01:29 -0800
Subject: [PATCH] docker: don't override horizon::vhost_extra_params

horizon::vhost_extra_params is already configured in
puppet/services/horizon.yaml, and users can change the value with
HorizonVhostExtraParams parameter.

Docker deployments didn't have HorizonVhostExtraParams taken in account
since we were overriding with Hiera. This patch fix it.

Closes-Bug: #1749627
Change-Id: I77f1312112c7f613d795242060709082ef72f150
---
 docker/services/horizon.yaml | 5 -----
 puppet/services/horizon.yaml | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index 907e4d4095..09a9c7cd15 100644
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@@ -67,11 +67,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [HorizonBase, role_data, config_settings]
-          - horizon::vhost_extra_params:
-              add_listen: true
-              priority: 10
-              access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
-              options: ['FollowSymLinks','MultiViews']
           - horizon::secure_cookies: false
       logging_source: {get_attr: [HorizonBase, role_data, logging_source]}
       logging_groups: {get_attr: [HorizonBase, role_data, logging_groups]}
diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml
index 4b422f7c94..ef81ebd505 100644
--- a/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@@ -79,6 +79,7 @@ parameters:
                  services in the internal network.
   HorizonVhostExtraParams:
     default:
+      add_listen: true
       priority: 10
       access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
       options: ['FollowSymLinks','MultiViews']