From 287a29429cf74b3f9bf87e10e4157a74d8c6568a Mon Sep 17 00:00:00 2001 From: efiacor Date: Thu, 2 Apr 2020 18:11:23 +0100 Subject: [DMaaP DR] New certs fro ElAlto images Change-Id: Ic5ce1f7642e2cd410f5d51e16402c712852481e2 Signed-off-by: efiacor Issue-ID: DMAAP-1421 --- .../components/dmaap-dr-node/resources/config/drNodeCadi.properties | 6 +++--- .../dmaap/components/dmaap-dr-node/resources/config/node.properties | 6 +++--- kubernetes/dmaap/components/dmaap-dr-node/values.yaml | 2 +- .../components/dmaap-dr-prov/resources/config/drProvCadi.properties | 6 +++--- .../components/dmaap-dr-prov/resources/config/provserver.properties | 6 +++--- kubernetes/dmaap/components/dmaap-dr-prov/values.yaml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'kubernetes') diff --git a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/drNodeCadi.properties b/kubernetes/dmaap/components/dmaap-dr-node/resources/config/drNodeCadi.properties index 043bb8bced..ea892d7bdd 100644 --- a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/drNodeCadi.properties +++ b/kubernetes/dmaap/components/dmaap-dr-node/resources/config/drNodeCadi.properties @@ -1,11 +1,11 @@ cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US cadi_keyfile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.keyfile cadi_keystore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks -cadi_keystore_password=WGxd2P6MDo*Bi4+UdzWs{?$8 -cadi_key_password=WGxd2P6MDo*Bi4+UdzWs{?$8 +cadi_keystore_password=[V7pj(U*?Jzpsl0aZP?3hS;? +cadi_key_password=[V7pj(U*?Jzpsl0aZP?3hS;? cadi_alias=dmaap-dr-node@dmaap-dr.onap.org cadi_truststore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks -cadi_truststore_password=)OBvCd{e{aWq.^mJJdX:S:1& +cadi_truststore_password=jH+{FIhNOX+tl:I7:dnJT($ aaf_env=DEV aaf_locate_url=https://aaf-locate:8095 diff --git a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties b/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties index 4379dfbf1d..cc8bdf7b16 100644 --- a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties +++ b/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties @@ -83,11 +83,11 @@ KeyStoreFile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks # # The password for the https keystore # -KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8 +KeyStorePassword=[V7pj(U*?Jzpsl0aZP?3hS;? # # The password for the private key in the https keystore # -KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8 +KeyPassword=[V7pj(U*?Jzpsl0aZP?3hS;? # # The type of truststore for https # @@ -99,7 +99,7 @@ TrustStoreFile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks # # The password for the https truststore # -TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1& +TrustStorePassword=jH+{FIhNOX+tl:I7:dnJT($3 # # The path to the file used to trigger an orderly shutdown # diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml index b5e459b6b9..bc70632b8b 100644 --- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml @@ -24,7 +24,7 @@ global: # Application configuration defaults. ################################################################# # application image -image: onap/dmaap/datarouter-node:2.1.2 +image: onap/dmaap/datarouter-node:2.2.0 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/drProvCadi.properties b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/drProvCadi.properties index 79abe22a6a..771b03488b 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/drProvCadi.properties +++ b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/drProvCadi.properties @@ -1,11 +1,11 @@ cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US cadi_keyfile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.keyfile cadi_keystore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks -cadi_keystore_password=FZNkU,B%NJzcT1v7;^v]M#ZX -cadi_key_password=FZNkU,B%NJzcT1v7;^v]M#ZX +cadi_keystore_password=)OC(*mtYL!1ZJk{sLl3bk?@h +cadi_key_password=)OC(*mtYL!1ZJk{sLl3bk?@h cadi_alias=dmaap-dr-prov@dmaap-dr.onap.org cadi_truststore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks -cadi_truststore_password=+mzf@J.D^;3!![*Xr.z$c#?b +cadi_truststore_password=vn$sH1Y8X$so:&9u0zYsz{7c aaf_env=DEV aaf_locate_url=https://aaf-locate:8095 diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties index 210fb7c75f..05e69b16bc 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties +++ b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties @@ -27,12 +27,12 @@ org.onap.dmaap.datarouter.provserver.http.port = {{.Values.config.dmaa org.onap.dmaap.datarouter.provserver.https.port = {{.Values.config.dmaapDrProv.internalPort2}} org.onap.dmaap.datarouter.provserver.https.relaxation = true -org.onap.dmaap.datarouter.provserver.keymanager.password = FZNkU,B%NJzcT1v7;^v]M#ZX +org.onap.dmaap.datarouter.provserver.keymanager.password = )OC(*mtYL!1ZJk{sLl3bk?@h org.onap.dmaap.datarouter.provserver.keystore.type = jks org.onap.dmaap.datarouter.provserver.keystore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks -org.onap.dmaap.datarouter.provserver.keystore.password = FZNkU,B%NJzcT1v7;^v]M#ZX +org.onap.dmaap.datarouter.provserver.keystore.password = )OC(*mtYL!1ZJk{sLl3bk?@h org.onap.dmaap.datarouter.provserver.truststore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks -org.onap.dmaap.datarouter.provserver.truststore.password = +mzf@J.D^;3!![*Xr.z$c#?b +org.onap.dmaap.datarouter.provserver.truststore.password = vn$sH1Y8X$so:&9u0zYsz{7c org.onap.dmaap.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs org.onap.dmaap.datarouter.provserver.spooldir = /opt/app/datartr/spool org.onap.dmaap.datarouter.provserver.dbscripts = /opt/app/datartr/etc/misc diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml index 195bcb47be..aa6c060b23 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml @@ -23,7 +23,7 @@ global: # Application configuration defaults. ################################################################# # application image -image: onap/dmaap/datarouter-prov:2.1.2 +image: onap/dmaap/datarouter-prov:2.2.0 pullPolicy: Always # flag to enable debugging - application support required -- cgit 1.2.3-korg