preliminary AAF changes for DR

Change-Id: I526648c42f8205c0f09b3c077aa1203e336f4f5f
Issue-ID: DMAAP-558
Signed-off-by: Ronan Keogh <ronan.keogh@ericsson.com>

7 files changed, 10 insertions, 11 deletions

diff --git a/docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.jks b/docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.jks
new file mode 100755
index 00000000..4529cccb
--- /dev/null
+++ b/docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.jks
diff --git a/docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks b/docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks
new file mode 100755
index 00000000..096fbb26
--- /dev/null
+++ b/docker-compose/node_data/aaf_certs/org.onap.dmaap-dr.trust.jks
diff --git a/docker-compose/node_data/node.properties b/docker-compose/node_data/node.properties
index 20c5af12..de38cb6f 100644
--- a/docker-compose/node_data/node.properties
+++ b/docker-compose/node_data/node.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================
 # * org.onap.dmaap
 # * ===========================================================================
-# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 # * ===========================================================================
 # * Licensed under the Apache License, Version 2.0 (the "License");
 # * you may not use this file except in compliance with the License.
@@ -25,14 +25,14 @@
 #
 #    URL to retrieve dynamic configuration
 #
-#ProvisioningURL:    ${DRTR_PROV_INTURL:-https://feeds-drtr.web.att.com/internal/prov}
-ProvisioningURL=https://prov.datarouternew.com:8443/internal/prov
+#ProvisioningURL:    ${DRTR_PROV_INTURL}
+ProvisioningURL=https://dmaap-dr-prov:8443/internal/prov
 
 #
 #    URL to upload PUB/DEL/EXP logs
 #
-#LogUploadURL:    ${DRTR_LOG_URL:-https://feeds-drtr.web.att.com/internal/logs}
-LogUploadURL=https://prov.datarouternew.com:8443/internal/logs
+#LogUploadURL:    ${DRTR_LOG_URL}
+LogUploadURL=https://dmaap-dr-prov:8443/internal/logs
 
 #
 #    The port number for http as seen within the server
@@ -74,20 +74,19 @@ SpoolDir=/opt/app/datartr/spool
 #RedirectionFile:    etc/redirections.dat
 #
 #    The type of keystore for https
-#
 KeyStoreType:    jks
 #
 #    The path to the keystore for https
 #
-KeyStoreFile:/opt/app/datartr/self_signed/keystore.jks
+KeyStoreFile:/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
 #
 #    The password for the https keystore
 #
-KeyStorePassword=changeit
+KeyStorePassword=4*&GD+w58RUM]01No.CYY;z6
 #
 #    The password for the private key in the https keystore
 #
-KeyPassword=changeit
+KeyPassword=4*&GD+w58RUM]01No.CYY;z6
 #
 #    The type of truststore for https
 #
@@ -96,11 +95,11 @@ TrustStoreType=jks
 #    The path to the truststore for https
 #
 #TrustStoreFile=/usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts
-TrustStoreFile=/opt/app/datartr/self_signed/cacerts.jks
+TrustStoreFile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
 #
 #    The password for the https truststore
 #
-TrustStorePassword=changeit
+TrustStorePassword=UDXlT6Iu[F)k,Htk92+B,0Xj
 #
 #    The path to the file used to trigger an orderly shutdown
 #
diff --git a/docker-compose/node_data/self_signed/cacerts.jks b/docker-compose/node_data/self_signed/cacerts.jks
deleted file mode 100644
index dfd81433..00000000
--- a/docker-compose/node_data/self_signed/cacerts.jks
+++ /dev/null
diff --git a/docker-compose/node_data/self_signed/keystore.jks b/docker-compose/node_data/self_signed/keystore.jks
deleted file mode 100644
index e5a4e781..00000000
--- a/docker-compose/node_data/self_signed/keystore.jks
+++ /dev/null
diff --git a/docker-compose/node_data/self_signed/mykey.cer b/docker-compose/node_data/self_signed/mykey.cer
deleted file mode 100644
index 2a5c9d70..00000000
--- a/docker-compose/node_data/self_signed/mykey.cer
+++ /dev/null
diff --git a/docker-compose/node_data/self_signed/nodekey.cer b/docker-compose/node_data/self_signed/nodekey.cer
deleted file mode 100644
index 4cdfdfe3..00000000
--- a/docker-compose/node_data/self_signed/nodekey.cer
+++ /dev/null