From 1067a057be66c0a3eebf6a3cf243f97d210b3ced Mon Sep 17 00:00:00 2001 From: Grzegorz Grasza Date: Wed, 21 Apr 2021 11:24:35 +0200 Subject: [PATCH] Enable Memcached TLS on the overcloud by default Include the environment file for enabling memcached TLS when TLS Everywhere is enabled, so that it is tested in the CI (FS039). Change-Id: I9da7ab89453364e5405ad183b0f08dc2e5b014af --- roles/overcloud-deploy/tasks/pre-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/overcloud-deploy/tasks/pre-deploy.yml b/roles/overcloud-deploy/tasks/pre-deploy.yml index ba3da7595..b0f029510 100644 --- a/roles/overcloud-deploy/tasks/pre-deploy.yml +++ b/roles/overcloud-deploy/tasks/pre-deploy.yml @@ -167,6 +167,7 @@ -e {{ overcloud_templates_path }}/environments/services/haproxy-public-tls-certmonger.yaml -e {{ overcloud_templates_path }}/environments/ssl/enable-internal-tls.yaml -e {{ overcloud_templates_path }}/environments/ssl/tls-everywhere-endpoints-dns.yaml + -e {{ overcloud_templates_path }}/environments/ssl/enable-memcached-tls.yaml when: - enable_tls_everywhere|bool and undercloud_enable_novajoin|bool - release not in ['mitaka', 'liberty', 'newton'] @@ -177,6 +178,7 @@ -e {{ overcloud_templates_path }}/environments/services/haproxy-public-tls-certmonger.yaml -e {{ overcloud_templates_path }}/environments/ssl/enable-internal-tls.yaml -e {{ overcloud_templates_path }}/environments/ssl/tls-everywhere-endpoints-dns.yaml + -e {{ overcloud_templates_path }}/environments/ssl/enable-memcached-tls.yaml -e {{ working_dir }}/tls-everywhere.yaml when: - enable_tls_everywhere|bool and not undercloud_enable_novajoin|bool