diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-04-07 14:45:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-07 14:45:04 +0000 |
| commit | ea5251fd3e41c241e88ad88c70067179bc5bb1e6 (patch) | |
| tree | 004b6a5e6ed0617407fead05a7b4b5f2867c74fb | |
| parent | 5091974e31e945d629a0c8ffc477f587c53fa10b (diff) | |
| parent | 58a114896230cf78fa5e6031d74e3d3f2110c5b1 (diff) | |
Merge "Add env needed by installCerts.py to docker-compose.yml" into frankfurt
Former-commit-id: 1aff9ca180f2516190f53eadee4370537e57255d
| -rwxr-xr-x | installation/sdnc/src/main/scripts/startODL.sh | 3 | ||||
| -rw-r--r-- | installation/src/main/yaml/docker-compose.yml | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index e043bc04..47388512 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -173,6 +173,9 @@ fi cp /opt/opendaylight/current/certs/* /tmp cp -r /opt/app/osaaf/local/. /tmp +# Create ODL data log directory (it nornally is created after karaf +# is started, but needs to exist before installCerts.py runs) +mkdir -p /opt/opendaylight/data/log nohup python ${SDNC_BIN}/installCerts.py & exec ${ODL_HOME}/bin/karaf server diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml index 4e0de9b9..773d0616 100644 --- a/installation/src/main/yaml/docker-compose.yml +++ b/installation/src/main/yaml/docker-compose.yml @@ -59,6 +59,10 @@ services: environment: - MYSQL_ROOT_PASSWORD=openECOMP1.0 - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties + - SDNC_BIN=/opt/onap/sdnc/bin + - ODL_CERT_DIR=/tmp + - ODL_ADMIN_USERNAME=admin + - ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U dns: - ${DNS_IP_ADDR-10.0.100.1} logging: |