diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-24 18:55:45 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-24 18:55:45 +0000 |
commit | fbe9ec9405ad670da3ab21533aa29743388ee243 (patch) | |
tree | 117c1b5aeacfdf5ba23ec6cb422ff7c87dbe13fc /puppet/services/haproxy.yaml | |
parent | 5c1b9864e36ab259035e614bca6794a7c00b081c (diff) | |
parent | db4d11f7f57944456807f5e3fbd1ab0417017f9e (diff) |
Merge "Move Keepalived/HAproxy settings out of controller"
Diffstat (limited to 'puppet/services/haproxy.yaml')
-rw-r--r-- | puppet/services/haproxy.yaml | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml index 00574c2f..8ac669a9 100644 --- a/puppet/services/haproxy.yaml +++ b/puppet/services/haproxy.yaml @@ -18,6 +18,32 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + HAProxyStatsPassword: + description: Password for HAProxy stats endpoint + hidden: true + type: string + HAProxyStatsUser: + description: User for HAProxy stats endpoint + default: admin + type: string + HAProxySyslogAddress: + default: /dev/log + description: Syslog address where HAproxy will send its log + type: string + RedisPassword: + description: The password for Redis + type: string + hidden: true + ControlVirtualInterface: + default: 'br-ex' + description: Interface where virtual ip will be assigned. + type: string + PublicVirtualInterface: + default: 'br-ex' + description: > + Specifies the interface where the public-facing virtual ip will be assigned. + This should be int_public when a VLAN is being used. + type: string outputs: role_data: @@ -49,5 +75,11 @@ outputs: tripleo::haproxy::heat_cloudwatch: true tripleo::haproxy::heat_cfn: true tripleo::haproxy::horizon: true + tripleo::haproxy::haproxy_log_address: {get_param: HAProxySyslogAddress} + tripleo::haproxy::haproxy_stats_user: {get_param: HAProxyStatsUser} + tripleo::haproxy::haproxy_stats_password: {get_param: HAProxyStatsPassword} + tripleo::haproxy::redis_password: {get_param: RedisPassword} + tripleo::haproxy::control_virtual_interface: {get_param: ControlVirtualInterface} + tripleo::haproxy::public_virtual_interface: {get_param: PublicVirtualInterface} step_config: | include ::tripleo::profile::base::haproxy |