aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-without-mergepy.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-16 08:52:44 +0000
committerGerrit Code Review <review@openstack.org>2015-10-16 08:52:44 +0000
commit954491c442cbc34ec0a17086d4e90247437b1712 (patch)
tree813dfab744b712bff6a5b06a08373d928dcee228 /overcloud-without-mergepy.yaml
parentb6623b43966a74b729e6d2252e1b051b2ac748c0 (diff)
parent96112c1afe8622688baa5b1a987e597868e13b46 (diff)
Merge "Allow a deployer to specify HAProxy syslog server address"
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 66cb459..4a47efb 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -81,6 +81,10 @@ parameters:
default: http
description: Protocol to use when connecting to glance, set to https for SSL.
type: string
+ HAProxySyslogAddress:
+ default: /dev/log
+ description: Syslog address where HAproxy will send its log
+ type: string
HorizonAllowedHosts:
default: '*'
description: A list of IP/Hostname allowed to connect to horizon
@@ -790,6 +794,7 @@ resources:
GlanceBackend: {get_param: GlanceBackend}
GlanceNotifierStrategy: {get_param: GlanceNotifierStrategy}
GlanceLogFile: {get_param: GlanceLogFile}
+ HAProxySyslogAddress: {get_param: HAProxySyslogAddress}
HeatPassword: {get_param: HeatPassword}
HeatStackDomainAdminPassword: {get_param: HeatStackDomainAdminPassword}
HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}