diff options
| author |   Rene Robert <rene.robert@orange.com> | 2018-04-16 13:11:04 +0000 |
|---|---|---|
| committer |   mrichomme <morgan.richomme@orange.com> | 2018-04-16 18:48:13 +0200 |
| commit | 80f8b49d3480cb00cd1d774818d35355496f5a96 (patch) | |
| tree | 746a5c708478cfa2a24bfe877f4f96b40a8058ab | |
| parent | 49954e7bd4cef8743611b15f0bc2cc769e8e7c49 (diff) | |
Update NBI docker-compose file
Issue-ID: EXTAPI-75
Change-Id: I97ff5fe89257034cc2f5c87a592a81d156422c2a
Signed-off-by: Rene Robert <rene.robert@orange.com>
Signed-off-by: mrichomme <morgan.richomme@orange.com>
| -rw-r--r-- | docker-compose.yml | 15 | ||||
| -rw-r--r-- | src/main/resources/application.properties | 20 |
2 files changed, 18 insertions, 17 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 3aeb66e..a5debd8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.0" +version: "2" services: mongo: image: mongo:3 @@ -14,17 +14,18 @@ services: - /var/lib/mariadb environment: MYSQL_DATABASE: nbi - MYSQL_ROOT_PASSWORD: $SPRING_DATASOURCE_PASSWORD + MYSQL_PASSWORD: toto + MYSQL_RANDOM_ROOT_PASSWORD: 'yes' + MYSQL_USER: rene # APP *************************************************************************************** nbi: - build: - context: . - args: - SERVER_PORT: $SERVER_PORT + image: nexus3.onap.org:10001/onap/externalapi/nbi:latest ports: - - $SERVER_PORT:$SERVER_PORT + - 8080:8080 environment: SPRING_DATASOURCE_URL: jdbc:mariadb://mariadb:3306/nbi + SPRING_DATASOURCE_PASSWORD: toto + SPRING_DATASOURCE_USERNAME: rene SPRING_DATA_MONGODB_HOST: mongo depends_on: - mariadb diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bb07e4d..4e45084 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -22,27 +22,27 @@ server.port = 8080 logging.level.=INFO # ONAP -onap.lcpCloudRegionId= -onap.tenantId= -onap.cloudOwner= +onap.lcpCloudRegionId=RegionOne +onap.tenantId=6e97a2bd51d74f6db5671d8dc1517d82 +onap.cloudOwner=CloudOwner # NBI nbi.url=http://localhost:8080/nbi/api/v1 nbi.callForVNF=false # SDC -sdc.host=http://localhost:8090 -sdc.header.ecompInstanceId= -sdc.header.authorization= +sdc.host=http://10.0.3.1:8080 +sdc.header.ecompInstanceId=demo +sdc.header.authorization=Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU= # AAI -aai.host=http://localhost:8090 -aai.header.authorization= +aai.host=https://10.0.1.1:8443 +aai.header.authorization=Basic QUFJOkFBSQ== aai.api.id=AAI # SO -so.host=http://localhost:8090 -so.header.authorization= +so.host=http://10.0.5.1:8080 +so.header.authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== so.api.id=SO # MONGO |