aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-13 21:32:04 +0000
committerGerrit Code Review <review@openstack.org>2017-06-13 21:32:04 +0000
commit2dcad460b39f4fef7cc22f30adcb34abde48678f (patch)
treedb470f29ee959e3679d18ae083bbbb09e0f79f9e
parent6674bd958770fa125a9a6928afd2a5ebf558c446 (diff)
parentd8c0c33012d9a75e980f9f6cef59367594258af9 (diff)
Merge "Change HorizonSecureCookies default to False"
-rw-r--r--environments/enable-tls.yaml1
-rw-r--r--puppet/services/horizon.yaml2
2 files changed, 2 insertions, 1 deletions
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.