From: DylanB95EST <dylan.byrne@est.tech>
Date: Wed, 3 Nov 2021 13:55:44 +0000 (+0000)
Subject: Clean up commented sections to include CPS-CORE in variable names
X-Git-Tag: mr/823/126723/7~39^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=cps.git;a=commitdiff_plain;h=9d9b12a83fbb6f10c3c2f66688405978f77b31c9

Clean up commented sections to include CPS-CORE in variable names

Clean up commented out sections to include CPS_CORE in variable name as
part of CPS-759 bug.

Issue-ID: CPS-759
Change-Id: I40bbe0407a4e4589be8f7563733de2355ea5b8b9
Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
---

diff --git a/docker-compose/README.md b/docker-compose/README.md
index 3e6ab8367..623968f33 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -86,7 +86,7 @@ Then CPS can be started either using a Java Archive previously built or directly
 Following command starts the application using JAR file:
 
 ```bash
-DB_HOST=localhost DB_USERNAME=cps DB_PASSWORD=cps CPS_USERNAME=cpsuser CPS_PASSWORD=cpsr0cks! \
+DB_HOST=localhost DB_USERNAME=cps DB_PASSWORD=cps CPS_CORE_USERNAME=cpsuser CPS_CORE_PASSWORD=cpsr0cks! \
   java -jar cps-application/target/cps-application-x.y.z-SNAPSHOT.jar
 ```
 
@@ -97,7 +97,7 @@ Here are the steps to run or debug the application from Intellij:
 1. Enable the desired maven profile form Maven Tool Window
 2. Run a configuration from `Run -> Edit configurations` with following settings:
    * `Environment variables`: `DB_HOST=localhost;DB_USERNAME=cps;DB_PASSWORD=cps
-                                CPS_USERNAME=cpsuser CPS_PASSWORD=cpsr0cks!`
+                                CPS_CORE_USERNAME=cpsuser CPS_CORE_PASSWORD=cpsr0cks!`
 
 ## Accessing services
 
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 81d551901..d0a157e89 100755
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -30,8 +30,8 @@ services:
   #    - "8881:8080"
   #    - "8887:8081"
   #  environment:
-  #    CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
-  #    CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+  #    CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
+  #    CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
   #    DB_HOST: dbpostgresql
   #    DB_USERNAME: ${DB_USERNAME:-cps}
   #    DB_PASSWORD: ${DB_PASSWORD:-cps}
@@ -49,8 +49,8 @@ services:
   #    - "8882:8080"
   #    - "8887:8081"
   #  environment:
-  #    CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
-  #    CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+  #    CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
+  #    CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
   #    DB_HOST: dbpostgresql
   #    DB_USERNAME: ${DB_USERNAME:-cps}
   #    DB_PASSWORD: ${DB_PASSWORD:-cps}