Code Review
/
sdnc
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add env needed by installCerts.py to docker-compose.yml
[sdnc/oam.git]
/
installation
/
src
/
main
/
yaml
/
docker-compose.yml
diff --git
a/installation/src/main/yaml/docker-compose.yml
b/installation/src/main/yaml/docker-compose.yml
index
3852251
..
773d061
100644
(file)
--- 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
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:
dns:
- ${DNS_IP_ADDR-10.0.100.1}
logging:
@@
-66,6
+70,8
@@
services:
options:
max-size: "30m"
max-file: "5"
options:
max-size: "30m"
max-file: "5"
+ extra_hosts:
+ aaf.osaaf.org: 10.12.6.214
web:
web:
@@
-79,6
+85,7
@@
services:
- "cd /opt/onap/sdnc/admportal/shell && ./start_portal.sh"
ports:
- "8843:8843"
- "cd /opt/onap/sdnc/admportal/shell && ./start_portal.sh"
ports:
- "8843:8843"
+ - "8443:8443"
links:
- db:dbhost
- db:sdnctldb01
links:
- db:dbhost
- db:sdnctldb01
@@
-87,6
+94,7
@@
services:
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+ - CERT_PSWD=onap3.0
logging:
driver: "json-file"
options:
logging:
driver: "json-file"
options: