From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 21 Oct 2016 20:59:23 +0000 (+0000)
Subject: Merge "Clarify horizon allowed hosts setting"
X-Git-Tag: opnfv-6.0.0~1460
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f4ec754a4df333af597cc44208c3cc7114b47969;p=apex-tripleo-heat-templates.git

Merge "Clarify horizon allowed hosts setting"
---

f4ec754a4df333af597cc44208c3cc7114b47969
diff --cc puppet/services/horizon.yaml
index 6ea5ec4e,bdb171ae..1e08415c
--- a/puppet/services/horizon.yaml
+++ b/puppet/services/horizon.yaml
@@@ -24,13 -20,9 +24,14 @@@ parameters
      type: json
    HorizonAllowedHosts:
      default: '*'
-     description: A list of IP/Hostname allowed to connect to horizon
+     description: A list of IP/Hostname for the server Horizonis running on.
+                  Used for header checks.
      type: comma_delimited_list
 +  HorizonSecret:
 +    description: Secret key for Django
 +    type: string
 +    hidden: true
 +    default: ''
    NeutronMechanismDrivers:
      default: 'openvswitch'
      description: |