Merge "Revert "disable tls for issues in undercloud""

This commit is contained in:
Zuul 2020-01-27 19:06:20 +00:00 committed by Gerrit Code Review
commit b1d5115c17
1 changed files with 2 additions and 14 deletions

View File

@ -32,20 +32,8 @@ step_introspect: false
# This enables TLS for the undercloud which will also make haproxy bind to the
# configured public-vip and admin-vip.
# FIX-ME https://bugs.launchpad.net/tripleo/+bug/1860354
# disable TLS due to bug ^, set back to true
undercloud_generate_service_certificate: >-
{% if ('periodic' in zuul.pipeline and not job.force_non_periodic|default(false)|bool) or (job.force_periodic|default(false)|bool) -%}
true
{%- else -%}
false
{%- endif -%}
undercloud_enable_swift_encryption: >-
{% if ('periodic' in zuul.pipeline and not job.force_non_periodic|default(false)|bool) or (job.force_periodic|default(false)|bool) -%}
true
{%- else -%}
false
{%- endif -%}
undercloud_generate_service_certificate: true
undercloud_enable_swift_encryption: true
# This enables the deployment of the overcloud with SSL.
ssl_overcloud: false