Merge "Use intersphinx links for easier release update"
diff --git a/.gitreview b/.gitreview
index a84b86b..76242d9 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
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index bec9bfe..25974ba 100755
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -22,13 +22,13 @@
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 @@
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