preliminary AAF changes for DR

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

15 files changed, 31 insertions, 31 deletions

diff --git a/docker-compose/database/sql_init_01.sql b/docker-compose/database/sql_init_01.sql
index e01ce3b0..356a67a9 100644..100755
--- a/docker-compose/database/sql_init_01.sql
+++ b/docker-compose/database/sql_init_01.sql
@@ -124,18 +124,18 @@ CREATE TABLE GROUPS (
 );
 
 INSERT INTO PARAMETERS VALUES
-    ('ACTIVE_POD',  'prov.datarouternew.com'),
-    ('PROV_ACTIVE_NAME',  'prov.datarouternew.com'),
+    ('ACTIVE_POD',  'dmaap-dr-prov'),
+    ('PROV_ACTIVE_NAME',  'dmaap-dr-prov'),
     ('STANDBY_POD', ''),
-    ('PROV_NAME',   'prov.datarouternew.com'),
-    ('NODES',       '172.100.0.1|node.datarouternew.com'),
-    ('PROV_DOMAIN', 'datarouternew.com'),
+    ('PROV_NAME',   'dmaap-dr-prov'),
+    ('NODES',       'dmaap-dr-node'),
+    ('PROV_DOMAIN', ''),
     ('DELIVERY_INIT_RETRY_INTERVAL', '10'),
     ('DELIVERY_MAX_AGE', '86400'),
     ('DELIVERY_MAX_RETRY_INTERVAL', '3600'),
     ('DELIVERY_RETRY_RATIO', '2'),
     ('LOGROLL_INTERVAL', '300'),
-    ('PROV_AUTH_ADDRESSES', '172.100.0.1|prov.datarouternew.com|node.datarouternew.com'),
+    ('PROV_AUTH_ADDRESSES', 'dmaap-dr-prov|dmaap-dr-node'),
     ('PROV_AUTH_SUBJECTS', ''),
     ('PROV_MAXFEED_COUNT',  '10000'),
     ('PROV_MAXSUB_COUNT',   '100000'),
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index f8a4d843..35ed74c3 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -7,9 +7,9 @@
 # * Licensed under the Apache License, Version 2.0 (the "License");
 # * you may not use this file except in compliance with the License.
 # * You may obtain a copy of the License at
-# * 
+# *
 #  *      http://www.apache.org/licenses/LICENSE-2.0
-# * 
+# *
 #  * Unless required by applicable law or agreed to in writing, software
 # * distributed under the License is distributed on an "AS IS" BASIS,
 # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,10 +25,11 @@ services:
   datarouter-prov:
     image: nexus3.onap.org:10003/onap/dmaap/datarouter-prov
     container_name: datarouter-prov
-    hostname: prov.datarouternew.com
+    hostname: dmaap-dr-prov
     ports:
+     - "443:8443"
      - "8443:8443"
-     - "8080:8080"  
+     - "8080:8080"
     volumes:
      - ./prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties
      - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
@@ -37,12 +38,12 @@ services:
       mariadb_container:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://prov.datarouternew.com:8080/internal/prov"]
+      test: ["CMD", "curl", "-f", "http://dmaap-dr-prov:8080/internal/prov"]
       interval: 10s
       timeout: 10s
       retries: 5
     extra_hosts:
-      - "node.datarouternew.com:172.100.0.4"
+      - "dmaap-dr-node:172.100.0.4"
     networks:
       testing_net:
         ipv4_address: 172.100.0.3
@@ -50,7 +51,7 @@ services:
   datarouter-node:
     image: nexus3.onap.org:10003/onap/dmaap/datarouter-node
     container_name: datarouter-node
-    hostname: node.datarouternew.com
+    hostname: dmaap-dr-node
     ports:
      - "9443:8443"
      - "9090:8080"
@@ -60,7 +61,7 @@ services:
       datarouter-prov:
         condition: service_healthy
     extra_hosts:
-      - "prov.datarouternew.com:172.100.0.3"
+      - "dmaap-dr-prov:172.100.0.3"
     networks:
       testing_net:
         ipv4_address: 172.100.0.4
@@ -76,7 +77,7 @@ services:
       networks:
         testing_net:
           ipv4_address: 172.100.0.5
-      
+
   mariadb_container:
     image: mariadb:10.2.14
     container_name: mariadb
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
diff --git a/docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.jks b/docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.jks
new file mode 100755
index 00000000..155991ab
--- /dev/null
+++ b/docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.jks
diff --git a/docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks b/docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks
new file mode 100755
index 00000000..c8f9ee66
--- /dev/null
+++ b/docker-compose/prov_data/aaf_certs/org.onap.dmaap-dr.trust.jks
diff --git a/docker-compose/prov_data/provserver.properties b/docker-compose/prov_data/provserver.properties
index 7758a64d..744bc9ce 100644..100755
--- a/docker-compose/prov_data/provserver.properties
+++ b/docker-compose/prov_data/provserver.properties
@@ -27,11 +27,11 @@ org.onap.dmaap.datarouter.provserver.https.port          = 8443
 org.onap.dmaap.datarouter.provserver.https.relaxation    = true
 
 org.onap.dmaap.datarouter.provserver.keystore.type       = jks
-org.onap.dmaap.datarouter.provserver.keymanager.password = changeit
-org.onap.dmaap.datarouter.provserver.keystore.path       = /opt/app/datartr/self_signed/keystore.jks
-org.onap.dmaap.datarouter.provserver.keystore.password   = changeit
-org.onap.dmaap.datarouter.provserver.truststore.path     = /opt/app/datartr/self_signed/cacerts.jks
-org.onap.dmaap.datarouter.provserver.truststore.password = changeit
+org.onap.dmaap.datarouter.provserver.keymanager.password = Qgw77oaQcdP*F8Pwa[&.,.Ab
+org.onap.dmaap.datarouter.provserver.keystore.path       = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
+org.onap.dmaap.datarouter.provserver.keystore.password   = Qgw77oaQcdP*F8Pwa[&.,.Ab
+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 = 9M?)?:KAj1z6gpLhNrVUG@0T
 
 org.onap.dmaap.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs
 org.onap.dmaap.datarouter.provserver.spooldir            = /opt/app/datartr/spool
diff --git a/docker-compose/prov_data/self_signed/cacerts.jks b/docker-compose/prov_data/self_signed/cacerts.jks
deleted file mode 100644
index 76a480ad..00000000
--- a/docker-compose/prov_data/self_signed/cacerts.jks
+++ /dev/null
diff --git a/docker-compose/prov_data/self_signed/keystore.jks b/docker-compose/prov_data/self_signed/keystore.jks
deleted file mode 100644
index 2c22b4ac..00000000
--- a/docker-compose/prov_data/self_signed/keystore.jks
+++ /dev/null
diff --git a/docker-compose/prov_data/self_signed/mykey.cer b/docker-compose/prov_data/self_signed/mykey.cer
deleted file mode 100644
index 2a5c9d70..00000000
--- a/docker-compose/prov_data/self_signed/mykey.cer
+++ /dev/null