From 3e9a7ae889e10b61204c924da052d155d68911e5 Mon Sep 17 00:00:00 2001
From: DylanB95EST <dylan.byrne@est.tech>
Date: Thu, 14 Oct 2021 09:21:38 +0100
Subject: Create Istanbul Release Branch, release process step 9

Create release branch for Istanbul release on ncmp-dmi-plugin.
Update patch versions on properties and pom

Issue-ID: CPS-728
Change-Id: I7d48293076e916b942845223989fc305b7eb9685
Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
---
 .gitreview | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitreview b/.gitreview
index a84b86b8..76242d9b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,4 @@
         host=gerrit.onap.org
         port=29418
         project=cps/ncmp-dmi-plugin
-        defaultbranch=master
-        
\ No newline at end of file
+        defaultbranch=istanbul
-- 
cgit 1.2.3-korg


From 641cdb4da4c74acf49c8b548a32336c5bcbfc4ae Mon Sep 17 00:00:00 2001
From: tragait <rahul.tyagi@est.tech>
Date: Tue, 19 Oct 2021 16:38:16 +0100
Subject: fix docker compose for ncmp/dmi

Issue-ID: CPS-725
Signed-off-by: tragait <rahul.tyagi@est.tech>
Change-Id: I5c6bd80718a5ac3978ad0bf94503e357b1aebd07
---
 docker-compose/docker-compose.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index bec9bfec..25974baf 100755
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -22,13 +22,13 @@ version: "3.7"
 services:
   ncmp-dmi-plugin:
     container_name: ncmp-dmi-plugin
-    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${VERSION:-latest}
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-latest}
     ports:
-      - "8783:8080"
-      - "8787:8081"
+      - ${DMI_PORT:-8783}:8080
+      - ${DMI_MANAGEMENT_PORT:-8787}:8081
     environment:
-      CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
-      CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+      CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
+      CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
       CPS_CORE_HOST: ${CPS_CORE_HOST:-cps}
       CPS_CORE_PORT: ${CPS_CORE_PORT:-8080}
       CPS_CORE_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
@@ -38,6 +38,6 @@ services:
       SDNC_USERNAME: ${SDNC_USERNAME:-admin}
       SDNC_PASSWORD: ${SDNC_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
       DMI_SERVICE_URL: ${DMI_SERVICE_URL:-http://ncmp-dmi-plugin:8783}
-      DMI_USERNAME: "cpsuser"
-      DMI_PASSWORD: "cpsr0cks!"
+      DMI_USERNAME: ${DMI_USERNAME:-cpsuser}
+      DMI_PASSWORD: ${DMI_PASSWORD:-cpsr0cks!}
     restart: unless-stopped
-- 
cgit 1.2.3-korg