From 0acd15c5231c03ffed3743f4028214e3c71c11a3 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 16 Feb 2021 17:10:36 -0500 Subject: Redesign GRA database tables to support parallel updates Added new classes to support new tables for networks, vnfs, and vf-modules to allow parallel updates to different parts of the same service instance. Also, changed database initialization to use liquibase to create database tables. Change-Id: I53be2d7dc6a2bcdcc29300b95ba0c906e90d3238 Issue-ID: SDNC-1481 Signed-off-by: Dan Timoney --- .../src/main/dc/docker-compose.yaml | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'ms/generic-resource-api/src/main/dc') diff --git a/ms/generic-resource-api/src/main/dc/docker-compose.yaml b/ms/generic-resource-api/src/main/dc/docker-compose.yaml index fc70f43..37a5807 100755 --- a/ms/generic-resource-api/src/main/dc/docker-compose.yaml +++ b/ms/generic-resource-api/src/main/dc/docker-compose.yaml @@ -7,11 +7,11 @@ services: ports: - "13306:3306" environment: - - MYSQL_ROOT_PASSWORD=itsASecret + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - MYSQL_ROOT_HOST=% - - MYSQL_USER=gra - - MYSQL_PASSWORD=test123 - - MYSQL_DATABASE=gradb + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} logging: driver: "json-file" options: @@ -31,18 +31,17 @@ services: - db:dbhost environment: - MYSQL_DB_HOST=dbhost - - MYSQL_ROOT_PASSWORD=itsASecret - - MYSQL_USER=gra - - MYSQL_PASSWORD=test123 - - MYSQL_DATABASE=gradb - - LOG_LEVEL=TRACE + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + - SDNC_CONFIG_DIR=/opt/onap/sdnc/config + - LOG_LEVEL=INFO - TRUSTSTORE_PASSWORD=changeit - CACERT_PASSWORD=changeit - SDNC_CERT_DIR=/opt/onap/sdnc/config - JAVA_SECURITY_DIR=/usr/lib/jvm/default-jvm/jre/lib/security - TRUSTSTORE=truststoreONAPall.jks - volumes: - - ../resources:/opt/onap/sdnc/config logging: driver: "json-file" options: @@ -69,11 +68,11 @@ services: - db:sdnctldb01 - db:sdnctldb02 environment: - - MYSQL_ROOT_PASSWORD=itsASecret + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties - - MYSQL_USER=gra - - MYSQL_PASSWORD=test123 - - MYSQL_DATABASE=gradb + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} logging: driver: "json-file" options: -- cgit 1.2.3-korg