summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorFiachra Corcoran <fiachra.corcoran@est.tech>2022-11-04 08:38:40 +0000
committerGerrit Code Review <gerrit@onap.org>2022-11-04 08:38:40 +0000
commit50b18b6efacec1b51168976f033c0390e75cb8da (patch)
treed56fade54eb6ce67121d5f81e688f5cd01a79edf /kubernetes
parent3a394b89b271a29989dcc66b302810ea178db392 (diff)
parentdea12ce654007205bb4a1154ae0d3d964f99bcca (diff)
Merge "[SDNC] Simplify cert retrieval script"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/sdnc/components/sdnc-web/values.yaml15
-rw-r--r--kubernetes/sdnc/values.yaml3
2 files changed, 8 insertions, 10 deletions
diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index e838fb7e79..979698ffef 100644
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -69,14 +69,13 @@ certInitializer:
cadi_latitude: "38.0"
cadi_longitude: "-72.0"
credsPath: /opt/app/osaaf/local
- aaf_add_config: >
- cd /opt/app/osaaf/local;
- mkdir -p certs;
- export $(/opt/app/aaf_config/bin/agent.sh local showpass | grep '^c' | xargs -0);
- keytool -exportcert -rfc -file certs/cacert.pem -keystore {{ .Values.fqi_namespace }}.trust.jks -alias ca_local_0 -storepass $cadi_truststore_password;
- openssl pkcs12 -in {{ .Values.fqi_namespace }}.p12 -out certs/cert.pem -passin pass:$cadi_keystore_password_p12 -passout pass:$cadi_keystore_password_p12;
- cp {{ .Values.fqi_namespace }}.key certs/key.pem;
- chmod -R 755 certs;
+ aaf_add_config: |
+ cd /opt/app/osaaf/local
+ mkdir -p certs
+ keytool -exportcert -rfc -file certs/cacert.pem -keystore {{ .Values.fqi_namespace }}.trust.jks -alias ca_local_0 -storepass $cadi_truststore_password
+ openssl pkcs12 -in {{ .Values.fqi_namespace }}.p12 -out certs/cert.pem -passin pass:$cadi_keystore_password_p12 -passout pass:$cadi_keystore_password_p12
+ cp {{ .Values.fqi_namespace }}.key certs/key.pem
+ chmod -R 755 certs
# default number of instances
replicaCount: 1
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 1e0da8aeb4..1fd5bf3363 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -386,8 +386,7 @@ certInitializer:
cadi_longitude: "-72.0"
credsPath: /opt/app/osaaf/local
aaf_add_config: >
- cd /opt/app/osaaf/local;
- /opt/app/aaf_config/bin/agent.sh local showpass {{.Values.fqi}} {{ .Values.fqdn }} | grep cadi_keystore_password= | cut -d= -f 2 > {{ .Values.credsPath }}/.pass 2>&1
+ echo "$cadi_keystore_password" > {{ .Values.credsPath }}/.pass 2>&1
# dependency / sub-chart configuration
network-name-gen: