From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 23 Dec 2016 11:29:14 +0000 (+0000)
Subject: Merge "Manage disallow_iframe_embed"
X-Git-Tag: opnfv-6.0.0~1292
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=db45116afdd0c7673c5839122dadf570303d1e4b;p=apex-tripleo-heat-templates.git

Merge "Manage disallow_iframe_embed"
---

db45116afdd0c7673c5839122dadf570303d1e4b
diff --cc puppet/services/horizon.yaml
index e59dc202,3cdd069c..d7f10757
--- a/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@@@ -58,9 -58,9 +58,10 @@@ outputs
                dport:
                  - 80
                  - 443
 +          horizon::enable_secure_proxy_ssl_header: true
            horizon::disable_password_reveal: true
            horizon::enforce_password_check: true
+           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: