From fa1da98c8618e2e51ae5bddd6eb28fc1fb407e52 Mon Sep 17 00:00:00 2001 From: Fiachra Corcoran Date: Thu, 26 Jul 2018 07:23:34 +0100 Subject: Replacing att.com namespace Issue-ID: DMAAP-52 Change-Id: Ia6d5c1725119b893c50fed13c2c2d6fd47f4f917 Signed-off-by: Fiachra Corcoran --- .../resources/docker-compose/docker-compose.yml | 16 +++---- .../docker-compose/prov_data/provserver.properties | 53 +++++++++------------- 2 files changed, 29 insertions(+), 40 deletions(-) (limited to 'datarouter-prov/src/main/resources/docker-compose') diff --git a/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml b/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml index 4e2a81a7..1c33e3b8 100644 --- a/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml +++ b/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml @@ -20,10 +20,10 @@ # * ECOMP is a trademark and service mark of AT&T Intellectual Property. # * #------------------------------------------------------------------------------- -version: '2' +version: '2.1' services: datarouter-prov: - image: attos/datarouter-prov + image: onap/dmaap/datarouter-prov container_name: datarouter-prov hostname: prov.datarouternew.com ports: @@ -36,13 +36,13 @@ services: # - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt entrypoint: ["bash", "-c", "sleep 10; /bin/sh -c ./startup.sh"] depends_on: - - mysql_container + mysql_container: + condition: service_healthy extra_hosts: - "node.datarouternew.com:172.18.0.4" - datarouter-node: - image: attos/datarouter-node + image: onap/dmaap/datarouter-node container_name: datarouter-node hostname: node.datarouternew.com ports: @@ -60,10 +60,10 @@ services: image: mysql/mysql-server:5.6 container_name: mysql ports: - - "3306:3306" + - "3306:3306" environment: MYSQL_ROOT_PASSWORD: att2017 volumes: - - ./database:/tmp/database - - ./database:/docker-entrypoint-initdb.d + - ./database:/tmp/database + - ./database:/docker-entrypoint-initdb.d diff --git a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties index 6a03cbd1..b722a640 100644 --- a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties +++ b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.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. @@ -20,40 +20,29 @@ # * ECOMP is a trademark and service mark of AT&T Intellectual Property. # * #------------------------------------------------------------------------------- -# -# AT&T - PROPRIETARY -# THIS FILE CONTAINS PROPRIETARY INFORMATION OF -# AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN -# ACCORDANCE WITH APPLICABLE AGREEMENTS. -# -# Copyright (c) 2013 AT&T Knowledge Ventures -# Unpublished and Not for Publication -# All Rights Reserved -# -# CVS: $Id: provserver.properties,v 1.7 2013/05/29 14:44:36 eby Exp $ -# + #Jetty Server properties -com.att.research.datarouter.provserver.http.port = 8080 -com.att.research.datarouter.provserver.https.port = 8443 -com.att.research.datarouter.provserver.https.relaxation = true -com.att.research.datarouter.provserver.keymanager.password = changeit -com.att.research.datarouter.provserver.keystore.type = jks -com.att.research.datarouter.provserver.keystore.path = /opt/app/datartr/self_signed/keystore.jks +org.onap.dmaap.datarouter.provserver.http.port = 8080 +org.onap.dmaap.datarouter.provserver.https.port = 8443 +org.onap.dmaap.datarouter.provserver.https.relaxation = false +org.onap.dmaap.datarouter.provserver.keymanager.password = changeit +org.onap.dmaap.datarouter.provserver.keystore.type = jks +org.onap.dmaap.datarouter.provserver.keystore.path = /opt/app/datartr/self_signed/keystore.jks -com.att.research.datarouter.provserver.keystore.password = changeit -#com.att.research.datarouter.provserver.truststore.path = /home/eby/dr2/misc/cacerts+1 -#com.att.research.datarouter.provserver.truststore.path = /usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts -com.att.research.datarouter.provserver.truststore.path = /opt/app/datartr/self_signed/cacerts.jks +org.onap.dmaap.datarouter.provserver.keystore.password = changeit +#org.onap.dmaap.datarouter.provserver.truststore.path = /home/eby/dr2/misc/cacerts+1 +#org.onap.dmaap.datarouter.provserver.truststore.path = /usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts +org.onap.dmaap.datarouter.provserver.truststore.path = /opt/app/datartr/self_signed/cacerts.jks -com.att.research.datarouter.provserver.truststore.password = changeit -com.att.research.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs -com.att.research.datarouter.provserver.spooldir = /opt/app/datartr/spool -#com.att.research.datarouter.provserver.dbscripts = /home/eby/dr2/cvs/datarouter/prov/misc/ -com.att.research.datarouter.provserver.logretention = 30 +org.onap.dmaap.datarouter.provserver.truststore.password = changeit +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 = /home/eby/dr2/cvs/datarouter/prov/misc/ +org.onap.dmaap.datarouter.provserver.logretention = 30 # Database access -com.att.research.datarouter.db.driver = com.mysql.jdbc.Driver -com.att.research.datarouter.db.url = jdbc:mysql://172.18.0.2:3306/datarouter -com.att.research.datarouter.db.login = datarouter -com.att.research.datarouter.db.password = datarouter +org.onap.dmaap.datarouter.db.driver = com.mysql.jdbc.Driver +org.onap.dmaap.datarouter.db.url = jdbc:mysql://172.18.0.2:3306/datarouter +org.onap.dmaap.datarouter.db.login = datarouter +org.onap.dmaap.datarouter.db.password = datarouter -- cgit 1.2.3-korg