X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2FsoHelpers%2Ftemplates%2F_certificates.tpl;h=c5232e8f484407006c45b12dc20815b105d85870;hb=208c952967efcd791eb0ffc5432c92284bc5c881;hp=98876e3ceac56a7b51cef9dc4cd4617ac2399c24;hpb=c28ecc68065746659cdf858946cf09cd60d3629c;p=oom.git

diff --git a/kubernetes/so/components/soHelpers/templates/_certificates.tpl b/kubernetes/so/components/soHelpers/templates/_certificates.tpl
index 98876e3cea..c5232e8f48 100644
--- a/kubernetes/so/components/soHelpers/templates/_certificates.tpl
+++ b/kubernetes/so/components/soHelpers/templates/_certificates.tpl
@@ -5,7 +5,7 @@
 {{ include "common.certInitializer.initContainer" $subchartDot }}
 {{- if $dot.Values.global.aafEnabled }}
 - name: {{ include "common.name" $dot }}-msb-cert-importer
-  image: "{{ include "common.repository" $dot }}/{{ $dot.Values.global.aafAgentImage }}"
+  image: {{ include "repositoryGenerator.repository" $subchartDot }}/{{ $dot.Values.global.aafAgentImage }}
   imagePullPolicy: {{ $dot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }}
   command:
   - "/bin/sh"
@@ -17,10 +17,21 @@
       /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"
+      ls -lh {{ $subchartDot.Values.certInitializer.credsPath }}/mycreds.prop
+      cat {{ $subchartDot.Values.certInitializer.credsPath }}/mycreds.prop
+      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