diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-13 18:38:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-13 18:38:39 +0000 |
| commit | fb5eb77331006fe34991189b1f84c3ebb6c00132 (patch) | |
| tree | 22c34134df9fde85e6ec082339f11b94f8ce2c35 /puppet/services | |
| parent | 69ef806c798598b4d90406644f39e5280de55f23 (diff) | |
| parent | 6a340758cd5b820458a47906c9856e16d9c9b55c (diff) | |
Merge "Remove hardcoded enable_load_balancer from Controller role"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/haproxy.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml index 5bdc3b88..35dcc196 100644 --- a/puppet/services/haproxy.yaml +++ b/puppet/services/haproxy.yaml @@ -26,6 +26,10 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + EnableLoadBalancer: + default: true + description: Whether to deploy a LoadBalancer, set to false when an external load balancer is used. + type: boolean HAProxyStatsPassword: description: Password for HAProxy stats endpoint hidden: true @@ -100,6 +104,7 @@ outputs: tripleo::haproxy::ca_bundle: {get_param: InternalTLSCAFile} tripleo::haproxy::crl_file: {get_param: InternalTLSCRLPEMFile} tripleo::haproxy::haproxy_stats: {get_param: HAProxyStatsEnabled} + enable_load_balancer: {get_param: EnableLoadBalancer} tripleo::profile::base::haproxy::certificates_specs: map_merge: - get_attr: [HAProxyPublicTLS, role_data, certificates_specs] |