diff options
| author |   Rob Daugherty <rd472p@att.com> | 2018-10-09 17:29:46 -0400 |
|---|---|---|
| committer | Rob Daugherty <rd472p@att.com> | 2018-10-09 17:30:46 -0400 |
| commit | bc16bd477b1b1e28a032d82f5779edc95dd51839 (patch) | |
| tree | 5cb0bcbee1419d4ff6dfc0a12ecd3ff1d95004c9 | |
| parent | c4f7b701aa84ee19b37aae0c0d74cee614d983f2 (diff) | |
so-monitoring container is not started in heat env
Change-Id: I40b347e727c7d4ea6e6c285ff68e20d92feaadfe
Issue-ID: SO-1118
Signed-off-by: Rob Daugherty <rd472p@att.com>
| -rw-r--r-- | docker-compose.yml | 35 | ||||
| -rw-r--r-- | volumes/so/config/so-monitoring/onapheat/override.yaml | 17 |
2 files changed, 52 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 514af90..30c64fb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -299,3 +299,38 @@ services: - request-db-adapter:8083 - -- - "/app/start-app.sh" +################################################################################ + so-monitoring: + image: onap/so/so-monitoring + ports: + - "8088:8088" + volumes: + - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./volumes/so/config/so-monitoring/onapheat:/app/config + environment: + - APP=so-monitoring + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + so-monitoring.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" diff --git a/volumes/so/config/so-monitoring/onapheat/override.yaml b/volumes/so/config/so-monitoring/onapheat/override.yaml new file mode 100644 index 0000000..f8fea45 --- /dev/null +++ b/volumes/so/config/so-monitoring/onapheat/override.yaml @@ -0,0 +1,17 @@ +server: + port: 8088 + tomcat: + max-threads: 50 +ssl-enable: false +camunda: + rest: + api: + url: http://bpmn-infra:8081/engine-rest/engine/ + engine: default + auth: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== +mso: + database: + rest: + api: + url: http://so-request-db-adapter:8083/infraActiveRequests/ + auth: Basic YnBlbDpwYXNzd29yZDEk |