diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-29 06:34:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-29 06:34:27 +0000 |
| commit | d85635ba68e201c3ec5e42b4828e2f4291b8f080 (patch) | |
| tree | e6c1b2142fade0b0fc407a214dae16ef3d01a9f0 /puppet | |
| parent | 0f42bc25289d010ff829a1af5fcdcf31d5dac248 (diff) | |
| parent | ddc0d78dec04d0d2f4c1b5c7a6087321565b6f4a (diff) | |
Merge "Enable TLS in loadbalancer if cert path is detected"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller.yaml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 8f5fc116..4ec62762 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -1437,12 +1437,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} |