diff options
| author |   Steven Hardy <shardy@redhat.com> | 2017-07-06 17:39:00 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2017-07-11 17:14:53 +0100 |
| commit | 6a340758cd5b820458a47906c9856e16d9c9b55c (patch) | |
| tree | 155410fdd9b1baa886c2186d95697ab43f138c3c /puppet/services | |
| parent | d02faff1e5c6b091c9708ef44be5b61188110d90 (diff) | |
Remove hardcoded enable_load_balancer from Controller role
This is associated with the haproxy service, so set the hieradata there
instead. This is needed so we can render the controller role template
via j2, and also if anyone ever wants to run haproxy on some role other
then the Controller.
Change-Id: I82b992afe42f6da7788f6efca2366863c3bf68f7
Partially-Implements: blueprint composable-networks
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] |