aboutsummaryrefslogtreecommitdiffstats
path: root/platform-logic/installer
diff options
context:
space:
mode:
authorHector Anapan <ha076r@att.com>2017-08-10 03:25:53 -0500
committerPatrick Brady <pb071s@att.com>2017-08-11 19:25:36 +0000
commitd809474a8754d9fd9675427d3b8d93ecffd2070f (patch)
tree9fcb3cb8a0236d5e8c5b3abc8a5260e74a5bbace /platform-logic/installer
parentc183c5218b7fcd71976173e46c3dcde92be8e498 (diff)
Modifying code to point to AAIService Properties
Adding dblib.properties (mysql credential properties to the sdnctl db), modifying setenv.sh (used to define property values to mysql - such as authenticating against the MySQL DB's) and adding the APPC_CONFIG_DIR env variable as part of the Dockerfile. Patch: Reverted Unintentional changes to the docker-compose template. Patch: Changed some formatting as per Marcus's suggestions Change-Id: I7cf9d90405bb4d552779cd0cd8a4f01525bdd823 Signed-off-by: Hector Anapan <ha076r@att.com> Issue: [APPC-129]
Diffstat (limited to 'platform-logic/installer')
-rw-r--r--platform-logic/installer/src/main/scripts/setenv.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/platform-logic/installer/src/main/scripts/setenv.sh b/platform-logic/installer/src/main/scripts/setenv.sh
index ebf90d3..5484048 100644
--- a/platform-logic/installer/src/main/scripts/setenv.sh
+++ b/platform-logic/installer/src/main/scripts/setenv.sh
@@ -22,13 +22,14 @@
###
SDNC_CONFIG_DIR=${SDNC_CONFIG_DIR:-/opt/sdnc/data/properties}
+APPC_CONFIG_DIR=${APPC_CONFIG_DIR:-/opt/appc/data/properties}
-AAIURI=$(grep org.openecomp.sdnc.sli.aai.uri ${SDNC_CONFIG_DIR}/aaiclient.properties | grep -v '#' | cut -d'=' -f2)
+AAIURI=$(grep org.openecomp.sdnc.sli.aai.uri ${APPC_CONFIG_DIR}/aaiclient.properties | grep -v '#' | cut -d'=' -f2)
-MYSQL_USER=$(grep org.openecomp.sdnc.sli.jdbc.user ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
-MYSQL_PWD=$(grep org.openecomp.sdnc.sli.jdbc.password ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
-MYSQL_DB=$(grep org.openecomp.sdnc.sli.jdbc.database ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
-MYSQL_SERVER=$(grep org.openecomp.sdnc.sli.jdbc.hosts ${SDNC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2 | cut -d',' -f1)
+MYSQL_USER=$(grep org.openecomp.sdnc.sli.jdbc.user ${APPC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
+MYSQL_PWD=$(grep org.openecomp.sdnc.sli.jdbc.password ${APPC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
+MYSQL_DB=$(grep org.openecomp.sdnc.sli.jdbc.database ${APPCC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2)
+MYSQL_SERVER=$(grep org.openecomp.sdnc.sli.jdbc.hosts ${APPC_CONFIG_DIR}/dblib.properties | grep -v '#' | cut -d'=' -f2 | cut -d',' -f1)
ODLUSER=$(grep controllerUser ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2)
ODLPWD=$(grep controllerPass ${SDNC_CONFIG_DIR}/backup.properties | grep -v '#' | cut -d'=' -f2)