summaryrefslogtreecommitdiffstats
path: root/development
diff options
context:
space:
mode:
authorFilip Krzywka <filip.krzywka@nokia.com>2019-03-21 11:12:17 +0100
committerFilip Krzywka <filip.krzywka@nokia.com>2019-03-21 12:56:16 +0000
commit19d31337b1168617cefdf45c18219071fb56e0c6 (patch)
tree7505aa9d0148e9a3454f1a48d134f325707955bd /development
parent1eed57cfa680a6dcce80f05d57e69d61e947bb69 (diff)
Simplify consul usage
Change-Id: I707b6c52eb356cab471215b534f1143be3e4cbae Issue-ID: DCAEGEN2-710 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
Diffstat (limited to 'development')
-rw-r--r--development/consul.d/cbs.json10
-rw-r--r--development/consul/configuration.hcl34
-rw-r--r--development/docker-compose.yml5
3 files changed, 36 insertions, 13 deletions
diff --git a/development/consul.d/cbs.json b/development/consul.d/cbs.json
deleted file mode 100644
index 0761c7e5..00000000
--- a/development/consul.d/cbs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "service": {
- "name": "cbs",
- "tags": [
- "cbs"
- ],
- "port": 10000,
- "address": "config-binding-service"
- }
-}
diff --git a/development/consul/configuration.hcl b/development/consul/configuration.hcl
new file mode 100644
index 00000000..f975955e
--- /dev/null
+++ b/development/consul/configuration.hcl
@@ -0,0 +1,34 @@
+/*
+ * ============LICENSE_START=======================================================
+ * csit-dcaegen2-collectors-hv-ves
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+server = true
+bootstrap = true
+ui = true
+client_addr = "0.0.0.0"
+
+service {
+ # name under which hv-ves collector should seek cbs
+ # usually set as CONFIG_BINDING_SERVICE environment variable
+ Name = "CBS"
+ # address of CBS as seen by hv-ves collector
+ Address = "config-binding-service"
+ Port = 10000
+}
+
diff --git a/development/docker-compose.yml b/development/docker-compose.yml
index df00dcd5..e85b520b 100644
--- a/development/docker-compose.yml
+++ b/development/docker-compose.yml
@@ -36,9 +36,8 @@ services:
image: docker.io/consul:1.0.6
ports:
- "8500:8500"
- command: ["agent","-bootstrap", "-client=0.0.0.0", "-server", "-ui", "-config-dir=/consul/consul.d"]
volumes:
- - ./consul.d/:/consul/consul.d
+ - ./consul/:/consul/config
consul-config:
image: docker.io/consul:1.0.6
@@ -76,7 +75,7 @@ services:
environment:
JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid -Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml"
CONSUL_HOST: "consul-server"
- CONFIG_BINDING_SERVICE: "cbs"
+ CONFIG_BINDING_SERVICE: "CBS"
HOSTNAME: "dcae-hv-ves-collector"
healthcheck:
test: ./healthcheck.sh || exit 1