From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 13 Jun 2017 21:32:04 +0000 (+0000)
Subject: Merge "Change HorizonSecureCookies default to False"
X-Git-Tag: opnfv-6.0.0~557
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2dcad460b39f4fef7cc22f30adcb34abde48678f;hp=6674bd958770fa125a9a6928afd2a5ebf558c446;p=apex-tripleo-heat-templates.git

Merge "Change HorizonSecureCookies default to False"
---

diff --git a/environments/enable-tls.yaml b/environments/enable-tls.yaml
index 39ded654..481459cb 100644
--- a/environments/enable-tls.yaml
+++ b/environments/enable-tls.yaml
@@ -2,6 +2,7 @@
 # For these values to take effect, one of the tls-endpoints-*.yaml environments
 # must also be used.
 parameter_defaults:
+  HorizonSecureCookies: True
   SSLCertificate: |
     The contents of your certificate go here
   SSLIntermediateCertificate: ''
diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml
index 93bced8b..092d0720 100644
--- a/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@@ -55,7 +55,7 @@ parameters:
   HorizonSecureCookies:
     description: Set CSRF_COOKIE_SECURE / SESSION_COOKIE_SECURE in Horizon
     type: boolean
-    default: true
+    default: false
   MemcachedIPv6:
     default: false
     description: Enable IPv6 features in Memcached.