aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-without-mergepy.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-12 14:10:01 +0000
committerGerrit Code Review <review@openstack.org>2015-10-12 14:10:01 +0000
commit37830dd045467b0fa157c6c3604faf1329af752d (patch)
treee1d6e9499280528b7855b6a7fb6c039716728cff /overcloud-without-mergepy.yaml
parent461b8b0ce8476990c790701cdea960e6a2d6826f (diff)
parentc0bd689636e14ed64c702e9178d82df82f556550 (diff)
Merge "Allow one to specify horizon ALLOWED_HOSTS"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r--overcloud-without-mergepy.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 7fdba562..654c2427 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -78,6 +78,10 @@ parameters:
default: http
description: Protocol to use when connecting to glance, set to https for SSL.
type: string
+ HorizonAllowedHosts:
+ default: '*'
+ description: A list of IP/Hostname allowed to connect to horizon
+ type: comma_delimited_list
ImageUpdatePolicy:
default: 'REBUILD_PRESERVE_EPHEMERAL'
description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
@@ -780,6 +784,7 @@ resources:
HeatPassword: {get_param: HeatPassword}
HeatStackDomainAdminPassword: {get_param: HeatStackDomainAdminPassword}
HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}
+ HorizonAllowedHosts: {get_param: HorizonAllowedHosts}
HorizonSecret: {get_resource: HorizonSecret}
Image: {get_param: controllerImage}
ImageUpdatePolicy: {get_param: ImageUpdatePolicy}