Adjust to new DR docker-compose dir

Change-Id: Ib0adc762e0e00ce1d2715cf8ae313a90c96f16c6
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Issue-ID: DMAAP-847

diff --git a/plans/dmaap-buscontroller/with_dr/teardown.sh b/plans/dmaap-buscontroller/with_dr/teardown.sh
index 23ae60a..c7a2d6d 100755 (executable)
--- a/plans/dmaap-buscontroller/with_dr/teardown.sh
+++ b/plans/dmaap-buscontroller/with_dr/teardown.sh
@@ -21,6 +21,6 @@
 if [ "$KEEP_DMAAP" != "Y" ]
 then
 kill-instance.sh dmaapbc
-cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/
+cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources
 docker-compose down -v
 fi

diff --git a/scripts/dmaap-buscontroller/dr-launch.sh b/scripts/dmaap-buscontroller/dr-launch.sh
index abc0aae..bba1b73 100644 (file)
--- a/scripts/dmaap-buscontroller/dr-launch.sh
+++ b/scripts/dmaap-buscontroller/dr-launch.sh
@@ -20,9 +20,8 @@ function dmaap_dr_launch() {
        git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master
        cd datarouter
        git pull
-       cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/
+       cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources
 
-       sed -i 's/10003/10001/g' docker-compose.yml
        # start DMaaP DR containers with docker compose and configuration from docker-compose.yml
        docker login -u docker -p docker nexus3.onap.org:10001
        docker-compose up -d