From d418dd43e7812ea2cdebf188bf5ab51a997df90c Mon Sep 17 00:00:00 2001
From: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Date: Thu, 21 Mar 2019 09:10:11 +0100
Subject: 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>
---
 development/configuration/base.json          | 33 +++++++++++++++++++++++++++
 development/configuration/configuration.json | 34 ----------------------------
 development/docker-compose.yml               |  1 -
 3 files changed, 33 insertions(+), 35 deletions(-)
 create mode 100644 development/configuration/base.json
 delete mode 100644 development/configuration/configuration.json

(limited to 'development')

diff --git a/development/configuration/base.json b/development/configuration/base.json
new file mode 100644
index 00000000..5233f02c
--- /dev/null
+++ b/development/configuration/base.json
@@ -0,0 +1,33 @@
+{
+  "logLevel": "DEBUG",
+  "server": {
+    "listenPort": 6061,
+    "idleTimeoutSec": 60,
+    "maxPayloadSizeBytes": 1048576
+  },
+  "cbs": {
+    "firstRequestDelaySec": 10,
+    "requestIntervalSec": 5
+  },
+  "security": {
+    "keys": {
+      "keyStoreFile": "/etc/ves-hv/ssl/server.p12",
+      "keyStorePassword": "onaponap",
+      "trustStoreFile": "/etc/ves-hv/ssl/trust.p12",
+      "trustStorePassword": "onaponap"
+    }
+  },
+  "collector": {
+    "dummyMode": false,
+    "maxRequestSizeBytes": 1048576,
+    "kafkaServers": [
+      "message-router-kafka:9092"
+    ],
+    "routing": [
+      {
+        "fromDomain": "perf3gpp",
+        "toTopic": "HV_VES_PERF3GPP"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/development/configuration/configuration.json b/development/configuration/configuration.json
deleted file mode 100644
index 8e55cf39..00000000
--- a/development/configuration/configuration.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "logLevel": "DEBUG",
-  "server": {
-    "listenPort": 6061,
-    "idleTimeoutSec": 60,
-    "maxPayloadSizeBytes": 1048576
-  },
-  "cbs": {
-    "firstRequestDelaySec": 10,
-    "requestIntervalSec": 5
-  },
-  "security": {
-    "sslDisable": false,
-    "keys": {
-      "keyStoreFile": "/etc/ves-hv/ssl/server.p12",
-      "keyStorePassword": "onaponap",
-      "trustStoreFile": "/etc/ves-hv/ssl/trust.p12",
-      "trustStorePassword": "onaponap"
-    }
-  },
-  "collector": {
-    "dummyMode": false,
-    "maxRequestSizeBytes": 1048576,
-    "kafkaServers": [
-      "message-router-kafka:9092"
-    ],
-    "routing": [
-      {
-        "fromDomain": "perf3gpp",
-        "toTopic": "HV_VES_PERF3GPP"
-      }
-    ]
-  }
-}
\ No newline at end of file
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"
-- 
cgit 1.2.3-korg