From b633eaf73ae31354b3796beda64ce81a6b841912 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 2 Aug 2018 16:17:52 +0300
Subject: [PATCH] undercloud-post: Discard CA usage if not set

If there is nothing set for the CA, discard the value. This way we can
ignore this value when using trusted certificates.

Change-Id: Ia0085c43fe9468cd1827f6e4ae39f48ce0e398b6
Related-Bug: #1785059
---
 extraconfig/post_deploy/undercloud_post.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/extraconfig/post_deploy/undercloud_post.yaml b/extraconfig/post_deploy/undercloud_post.yaml
index fc7337fbb8..ee2eded259 100644
--- a/extraconfig/post_deploy/undercloud_post.yaml
+++ b/extraconfig/post_deploy/undercloud_post.yaml
@@ -85,6 +85,13 @@ conditions:
         - {get_param: PublicSSLCertificateAutogenerated}
         - true
 
+  ca_file_enabled:
+    and:
+    - not:
+        equals:
+        - {get_param: InternalTLSCAFile}
+        - ""
+    - tls_enabled
 
 resources:
 
@@ -115,7 +122,7 @@ resources:
         enable_validations: [get_params: EnableValidations]
         internal_tls_ca_file:
           if:
-          - tls_enabled
+          - ca_file_enabled
           - {get_param: InternalTLSCAFile}
           - ''
         # if SSL is enabled we use the public virtual ip as the stackrc endpoint