diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-10-16 08:52:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-10-16 08:52:44 +0000 |
| commit | 954491c442cbc34ec0a17086d4e90247437b1712 (patch) | |
| tree | 813dfab744b712bff6a5b06a08373d928dcee228 /puppet | |
| parent | b6623b43966a74b729e6d2252e1b051b2ac748c0 (diff) | |
| parent | 96112c1afe8622688baa5b1a987e597868e13b46 (diff) | |
Merge "Allow a deployer to specify HAProxy syslog server address"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index fe96236e..0bb8035b 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -180,6 +180,10 @@ parameters: type: string constraints: - allowed_values: ['swift', 'file', 'rbd'] + HAProxySyslogAddress: + default: /dev/log + description: Syslog address where HAproxy will send its log + type: string HeatPassword: default: unset description: The password for the Heat service and db account, used by the Heat services. @@ -671,6 +675,7 @@ resources: input_values: bootstack_nodeid: {get_attr: [Controller, name]} neutron_enable_tunneling: {get_param: NeutronEnableTunnelling} + haproxy_log_address: {get_param: HAProxySyslogAddress} heat.watch_server_url: list_join: - '' @@ -1236,6 +1241,7 @@ resources: public_virtual_interface: {get_input: public_virtual_interface} tripleo::loadbalancer::control_virtual_interface: {get_input: control_virtual_interface} tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface} + tripleo::loadbalancer::haproxy_log_address: {get_input: haproxy_log_address} tripleo::packages::enable_install: {get_input: enable_package_install} tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade} |