Update CCSDK docker version

Update to use version 1.1.3 of CCSDK odlsli docker to pick up
license fix

Change-Id: I5f3aa97690f37a2c5e4c25131974b35ce34d1241
Issue-ID: SDNC-1503
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: 87e15f4fceac2086bc12cdaaec5675ac9aa3cb43

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 6943f6e..10dec5e 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -25,7 +25,7 @@
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
         <sdnc.northbound.version>2.1.2</sdnc.northbound.version>
-        <ccsdk.docker.version>1.1.2</ccsdk.docker.version>
+        <ccsdk.docker.version>1.1.3</ccsdk.docker.version>
         <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
         <sdnc.keypass><![CDATA[;:G58,7ZhqOSI:7^oZCY[9Dv]]></sdnc.keypass>
         <sdnc.secureport>8443</sdnc.secureport>

diff --git a/installation/sdnc/src/main/dc/docker-compose.yaml b/installation/sdnc/src/main/dc/docker-compose.yaml
index 1eece80..9198348 100644 (file)
--- a/installation/sdnc/src/main/dc/docker-compose.yaml
+++ b/installation/sdnc/src/main/dc/docker-compose.yaml
@@ -7,8 +7,11 @@ services:
     ports:
       - "3306"
     environment:
-      - MYSQL_ROOT_PASSWORD=MySecretPassword
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_ROOT_HOST=%
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
     logging:       
       driver:   "json-file"
       options:  
@@ -29,14 +32,32 @@ services:
       - db:sdnctldb01
       - db:sdnctldb02
     environment:
-      - MYSQL_ROOT_PASSWORD=MySecretPassword
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
-      - SDNC_REPLICAS=1
-      - SDNC_DB_USER=sdnctl
-      - SDNC_DB_PASSWORD=gamma
-      - MYSQL_DATABASE=sdnctl
-      - SDNC_DB_INIT=true
-      - KARAF_CONSOLE_LOG_LEVEL=info
+      - SDNC_BIN=/opt/onap/sdnc/bin
+      - ODL_CERT_DIR=/tmp
+      - ODL_ADMIN_USERNAME=${ODL_USER}
+      - ODL_ADMIN_PASSWORD=${ODL_PASSWORD}
+      - ODL_USER=${ODL_USER}
+      - ODL_PASSWORD=${ODL_PASSWORD}
+      - SDNC_DB_INIT=true  
+      - HONEYCOMB_USER=${HONEYCOMB_USER}
+      - HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD}
+      - TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}
+      - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD}
+      - SO_USER=${SO_USER}
+      - SO_PASSWORD=${SO_PASSWORD}
+      - NENG_USER=${NENG_USER}
+      - NENG_PASSWORD=${NENG_PASSWORD}
+      - CDS_USER=${CDS_USER}
+      - CDS_PASSWORD=${CDS_PASSWORD}
+      - ANSIBLE_USER=${ANSIBLE_USER}
+      - ANSIBLE_PASSWORD=${ANSIBLE_PASSWORD}
+      - SQL_CRYPTKEY=${SQL_CRYPTKEY}
+      - A1_TRUSTSTORE_PASSWORD=a1adapter
     logging:
       driver:   "json-file"
       options: