aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2015-11-25 13:05:17 +0200
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2015-12-08 11:43:28 +0200
commitddc0d78dec04d0d2f4c1b5c7a6087321565b6f4a (patch)
tree18f199f75873fae717c79ac94bd7a7b3116345bb /puppet
parent4d59bbb55eae146d78c44282151d3d15eeded240 (diff)
Enable TLS in loadbalancer if cert path is detected
If there is a value for the certificate path (which should only happen if the environment for enabling TLS is used) then the loadbalancer will detect it and configure it's front ends correctly. On the other hand a proper override for the example environment was given, since this will be needed because we want to pass the hosts and protocols correctly so the tripleoclient will catch it and pass it to os-cloud-config Change-Id: Ifba51495f0c99398291cfd29d10c04ec33b8fc34 Depends-On: Ie2428093b270ab8bc19fcb2130bb16a41ca0ce09
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller.yaml7
1 files changed, 1 insertions, 6 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 2c1c18a3..be472c7c 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1343,12 +1343,7 @@ resources:
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}
- # NOTE(jaosorior): The service certificate configuration for
- # HAProxy was left commented because to properly use this, we
- # need to be able to set up the keystone endpoints. And
- # currently that is not possible, but is being addressed by
- # other commits. A subsequent commit will uncomment this.
- #tripleo::loadbalancer::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
+ tripleo::loadbalancer::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
tripleo::packages::enable_install: {get_input: enable_package_install}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}