diff options
| author |   Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2019-03-21 09:10:11 +0100 |
|---|---|---|
| committer | Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2019-03-21 09:13:51 +0100 |
| commit | d418dd43e7812ea2cdebf188bf5ab51a997df90c (patch) | |
| tree | 60c33ac48330cca76bf8379ec5ed6fa48eac3e22 /development | |
| parent | 30afcb56b0c6c4529fdaf68d7b061eee44d68d16 (diff) | |
Include basic configuration in Docker image
Makes the collector start out of the box, even without valid CBS
configuration.
Note: the basic configuration will need to be changed later.
Issue-ID: DCAEGEN2-1340
Change-Id: I3c2b502f253677e78a4f4990002e683613b8869e
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Diffstat (limited to 'development')
| -rw-r--r-- | development/configuration/base.json (renamed from development/configuration/configuration.json) | 1 | ||||
| -rw-r--r-- | development/docker-compose.yml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/development/configuration/configuration.json b/development/configuration/base.json index 8e55cf39..5233f02c 100644 --- a/development/configuration/configuration.json +++ b/development/configuration/base.json @@ -10,7 +10,6 @@ "requestIntervalSec": 5 }, "security": { - "sslDisable": false, "keys": { "keyStoreFile": "/etc/ves-hv/ssl/server.p12", "keyStorePassword": "onaponap", diff --git a/development/docker-compose.yml b/development/docker-compose.yml index 85500cbb..df00dcd5 100644 --- a/development/docker-compose.yml +++ b/development/docker-compose.yml @@ -73,7 +73,6 @@ services: ports: - "6060:6060" - "6061:6061/tcp" - command: ["--configuration-file /etc/ves-hv/configuration/configuration.json"] environment: JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid -Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml" CONSUL_HOST: "consul-server" |