Updating cadi jks passwords DMaap DR

Change-Id: If58484506ce4ae5369a31ec1d5ef374dfb8cceff
Issue-ID: DMAAP-1186
Signed-off-by: efiacor <fiachra.corcoran@est.tech>

4 files changed, 10 insertions, 10 deletions

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 90c413738c..043bb8bced 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/drNodeCadi.properties
+++ b/kubernetes/dmaap/components/dmaap-dr-node/resources/config/drNodeCadi.properties
@@ -1,14 +1,14 @@
 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=]3V)($O&.Mv]W{f8^]6SxGNL
-cadi_key_password=]3V)($O&.Mv]W{f8^]6SxGNL
+cadi_keystore_password=WGxd2P6MDo*Bi4+UdzWs{?$8
+cadi_key_password=WGxd2P6MDo*Bi4+UdzWs{?$8
 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=(Rd,&{]%ePdp}4JZjqoJ2G+g
+cadi_truststore_password=)OBvCd{e{aWq.^mJJdX:S:1&
 
 aaf_env=DEV
-aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
+aaf_locate_url=https://aaf-locate:8095
 aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.1/introspect
 aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.1/token
 aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1
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 08e3fd0018..5de5fc1814 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties
+++ b/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties
@@ -122,7 +122,7 @@ AAFInstance = legacy
 AAFAction = publish
 #
 #    AAF URL to connect to AAF server
-AafUrl = https://aaf-onap-test.osaaf.org:8095
+AafUrl = https://aaf-locate:8095
 #
 #    AAF CADI enabled flag
 CadiEnabled = false
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 6a875146bd..79abe22a6a 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/drProvCadi.properties
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/drProvCadi.properties
@@ -1,14 +1,14 @@
 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=AT{];bvaDiytVD&oWhMZj0N5
-cadi_key_password=AT{];bvaDiytVD&oWhMZj0N5
+cadi_keystore_password=FZNkU,B%NJzcT1v7;^v]M#ZX
+cadi_key_password=FZNkU,B%NJzcT1v7;^v]M#ZX
 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=ljlS@Y}0]{UO(TnwvEWkgJ%]
+cadi_truststore_password=+mzf@J.D^;3!![*Xr.z$c#?b
 
 aaf_env=DEV
-aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
+aaf_locate_url=https://aaf-locate:8095
 aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.1/introspect
 aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.1/token
 aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1
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 6a6f49cc24..a4e96f0af6 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
@@ -62,5 +62,5 @@ org.onap.dmaap.datarouter.provserver.aaf.action.publish   = publish
 org.onap.dmaap.datarouter.provserver.aaf.action.subscribe = subscribe
 
 # AAF URL to connect to AAF server
-org.onap.dmaap.datarouter.provserver.cadi.aaf.url = https://aaf-onap-test.osaaf.org:8095
+org.onap.dmaap.datarouter.provserver.cadi.aaf.url = https://aaf-locate:8095