Merge "[DCAEMOD] Uses new tpls for repos / images"

[oom.git] / kubernetes / so / components / soHelpers / templates / _certificates.tpl

diff --git a/kubernetes/so/components/soHelpers/templates/_certificates.tpl b/kubernetes/so/components/soHelpers/templates/_certificates.tpl
index fa25ba5..66497e1 100644 (file)
--- 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"
@@ -16,7 +16,11 @@
     keytool -import -trustcacerts -alias msb_root -file \
       /certificates/msb-ca.crt -keystore \
       "{{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.aaf.trustore }}" \
-      -keypass $cadi_truststore_password -noprompt
+      -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
   volumeMounts:
   {{ include "common.certInitializer.volumeMount" $subchartDot | indent 2 | trim }}
   - name: {{ include "common.name" $dot }}-msb-certificate
@@ -52,7 +56,7 @@
   value: {{ $subchartDot.Values.certInitializer.credsPath }}/{{ $subchartDot.Values.aaf.trustore }}
 {{-     if $dot.Values.global.security.aaf.enabled }}
 - name: KEYSTORE
-  value: {{ $subchartDot.Values.certInitializer.credsPath }}/org.onap.so.jks
+  value: {{ $subchartDot.Values.certInitializer.credsPath }}/org.onap.so.p12
 {{-     end }}
 {{-   end }}
 {{- end -}}