From 5fa2433aff588a48707ce9bbd842ddcc436eea81 Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 30 Nov 2020 09:30:16 +0100
Subject: [SO] Add some debug when password is not well set

Sometimes, password generated by AAF is not well escaped by sh. As we
don't know which characters are giving bad results, we'll temporarily
show SO faulty generated passwords.

Issue-ID: OOM-2617
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ia99ba686b2ab4ed773d9c4344bd95338b9f0bdf1
---
 .../so/components/soHelpers/templates/_certificates.tpl | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/kubernetes/so/components/soHelpers/templates/_certificates.tpl b/kubernetes/so/components/soHelpers/templates/_certificates.tpl
index 66497e1afa..cc22dc97c3 100644
--- a/kubernetes/so/components/soHelpers/templates/_certificates.tpl
+++ b/kubernetes/so/components/soHelpers/templates/_certificates.tpl
@@ -17,10 +17,19 @@
       /certificates/msb-ca.crt -keystore \
       "{{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.aaf.trustore }}" \
       -storepass $cadi_truststore_password -noprompt
-    keytool -importkeystore -srckeystore "{{ $subchartDot.Values.certInitializer.credsPath }}/truststoreONAPall.jks" \
-      -srcstorepass {{ $subchartDot.Values.certInitializer.trustStoreAllPass }} \
-      -destkeystore "{{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.aaf.trustore }}" \
-      -deststorepass $cadi_truststore_password -noprompt
+    export EXIT_VALUE=$?
+    if [ "${EXIT_VALUE}" != "0" ]
+    then
+      echo "issue with password: $cadi_truststore_password"
+      exit $EXIT_VALUE
+    else
+      keytool -importkeystore -srckeystore "{{ $subchartDot.Values.certInitializer.credsPath }}/truststoreONAPall.jks" \
+        -srcstorepass {{ $subchartDot.Values.certInitializer.trustStoreAllPass }} \
+        -destkeystore "{{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.aaf.trustore }}" \
+        -deststorepass $cadi_truststore_password -noprompt
+        export EXIT_VALUE=$?
+    fi
+    exit $EXIT_VALUE
   volumeMounts:
   {{ include "common.certInitializer.volumeMount" $subchartDot | indent 2 | trim }}
   - name: {{ include "common.name" $dot }}-msb-certificate
-- 
cgit 1.2.3-korg