Adding kafka and XOS-core parameters to xos-services involved in SEBA
Change-Id: I862b788f44098a956d5f471ef1a80be6943d0d34
diff --git a/xos-services/att-workflow-driver/templates/_helpers.tpl b/xos-services/att-workflow-driver/templates/_helpers.tpl
index acbbdcc..86daf56 100644
--- a/xos-services/att-workflow-driver/templates/_helpers.tpl
+++ b/xos-services/att-workflow-driver/templates/_helpers.tpl
@@ -51,7 +51,7 @@
accessor:
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
- endpoint: xos-core:50051
+ endpoint: {{ .Values.xosCoreService | quote }}
event_bus:
endpoint: {{ .Values.kafkaService | quote }}
kind: kafka
@@ -68,7 +68,7 @@
kafka:
class: kafkaloghandler.KafkaLogHandler
bootstrap_servers:
- - "cord-kafka:9092"
+ - "{{ .Values.kafkaService }}:9092"
topic: xos.log.att-workflow-driver
loggers:
'':
diff --git a/xos-services/att-workflow-driver/values.yaml b/xos-services/att-workflow-driver/values.yaml
index d1c0289..56b5516 100644
--- a/xos-services/att-workflow-driver/values.yaml
+++ b/xos-services/att-workflow-driver/values.yaml
@@ -32,6 +32,7 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+xosCoreService: "xos-core:50051"
kafkaService: "cord-kafka"
diff --git a/xos-services/fabric-crossconnect/templates/_helpers.tpl b/xos-services/fabric-crossconnect/templates/_helpers.tpl
index 58c4829..53aae13 100644
--- a/xos-services/fabric-crossconnect/templates/_helpers.tpl
+++ b/xos-services/fabric-crossconnect/templates/_helpers.tpl
@@ -51,7 +51,7 @@
accessor:
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
- endpoint: xos-core:50051
+ endpoint: {{ .Values.xosCoreService | quote }}
event_bus:
endpoint: {{ .Values.kafkaService | quote }}
kind: kafka
@@ -68,7 +68,7 @@
kafka:
class: kafkaloghandler.KafkaLogHandler
bootstrap_servers:
- - "cord-kafka:9092"
+ - "{{ .Values.kafkaService }}:9092"
topic: xos.log.fabric-crossconnect
loggers:
'':
diff --git a/xos-services/fabric-crossconnect/values.yaml b/xos-services/fabric-crossconnect/values.yaml
index 4994d5a..3e441b6 100644
--- a/xos-services/fabric-crossconnect/values.yaml
+++ b/xos-services/fabric-crossconnect/values.yaml
@@ -32,6 +32,7 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+xosCoreService: "xos-core:50051"
kafkaService: "cord-kafka"
diff --git a/xos-services/fabric/templates/_helpers.tpl b/xos-services/fabric/templates/_helpers.tpl
index 0da937c..747aa6f 100644
--- a/xos-services/fabric/templates/_helpers.tpl
+++ b/xos-services/fabric/templates/_helpers.tpl
@@ -51,7 +51,7 @@
accessor:
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
- endpoint: xos-core:50051
+ endpoint: {{ .Values.xosCoreService | quote }}
event_bus:
endpoint: {{ .Values.kafkaService | quote }}
kind: kafka
@@ -68,7 +68,7 @@
kafka:
class: kafkaloghandler.KafkaLogHandler
bootstrap_servers:
- - "cord-kafka:9092"
+ - "{{ .Values.kafkaService }}:9092"
topic: xos.log.fabric
loggers:
'':
diff --git a/xos-services/fabric/values.yaml b/xos-services/fabric/values.yaml
index de47cc9..0a17c87 100644
--- a/xos-services/fabric/values.yaml
+++ b/xos-services/fabric/values.yaml
@@ -32,6 +32,7 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+xosCoreService: "xos-core:50051"
kafkaService: "cord-kafka"
diff --git a/xos-services/kubernetes/templates/_helpers.tpl b/xos-services/kubernetes/templates/_helpers.tpl
index a58f7f6..98ee611 100644
--- a/xos-services/kubernetes/templates/_helpers.tpl
+++ b/xos-services/kubernetes/templates/_helpers.tpl
@@ -47,7 +47,7 @@
accessor:
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
- endpoint: xos-core:50051
+ endpoint: {{ .Values.xosCoreService | quote }}
event_bus:
endpoint: {{ .Values.kafkaService | quote }}
kind: kafka
@@ -64,7 +64,7 @@
kafka:
class: kafkaloghandler.KafkaLogHandler
bootstrap_servers:
- - "cord-kafka:9092"
+ - "{{ .Values.kafkaService }}:9092"
topic: xos.log.kubernetes
loggers:
'':
diff --git a/xos-services/kubernetes/values.yaml b/xos-services/kubernetes/values.yaml
index a1383be..eb39651 100644
--- a/xos-services/kubernetes/values.yaml
+++ b/xos-services/kubernetes/values.yaml
@@ -32,6 +32,7 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+xosCoreService: "xos-core:50051"
kafkaService: "cord-kafka"
diff --git a/xos-services/onos-service/templates/_helpers.tpl b/xos-services/onos-service/templates/_helpers.tpl
index f408f3f..3d7d57c 100644
--- a/xos-services/onos-service/templates/_helpers.tpl
+++ b/xos-services/onos-service/templates/_helpers.tpl
@@ -52,7 +52,7 @@
accessor:
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
- endpoint: xos-core:50051
+ endpoint: {{ .Values.xosCoreService | quote }}
event_bus:
endpoint: {{ .Values.kafkaService | quote }}
kind: kafka
@@ -69,7 +69,7 @@
kafka:
class: kafkaloghandler.KafkaLogHandler
bootstrap_servers:
- - "cord-kafka:9092"
+ - "{{ .Values.kafkaService }}:9092"
topic: xos.log.onos-service
loggers:
'':
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 21c4bbe..f39612d 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -32,6 +32,7 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+xosCoreService: "xos-core:50051"
kafkaService: "cord-kafka"
diff --git a/xos-services/rcord/templates/_helpers.tpl b/xos-services/rcord/templates/_helpers.tpl
index 3665028..2ce2d5f 100644
--- a/xos-services/rcord/templates/_helpers.tpl
+++ b/xos-services/rcord/templates/_helpers.tpl
@@ -47,7 +47,7 @@
accessor:
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
- endpoint: xos-core:50051
+ endpoint: {{ .Values.xosCoreService | quote }}
logging:
version: 1
handlers:
@@ -61,7 +61,7 @@
kafka:
class: kafkaloghandler.KafkaLogHandler
bootstrap_servers:
- - "cord-kafka:9092"
+ - "{{ .Values.kafkaService }}:9092"
topic: xos.log.rcord
loggers:
'':
diff --git a/xos-services/rcord/values.yaml b/xos-services/rcord/values.yaml
index a6e1155..491b031 100644
--- a/xos-services/rcord/values.yaml
+++ b/xos-services/rcord/values.yaml
@@ -32,6 +32,9 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+xosCoreService: "xos-core:50051"
+
+kafkaService: "cord-kafka"
resources: {}
diff --git a/xos-services/volt/templates/_helpers.tpl b/xos-services/volt/templates/_helpers.tpl
index 93b3f29..68aad4c 100644
--- a/xos-services/volt/templates/_helpers.tpl
+++ b/xos-services/volt/templates/_helpers.tpl
@@ -51,7 +51,7 @@
accessor:
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
- endpoint: xos-core:50051
+ endpoint: {{ .Values.xosCoreService | quote }}
event_bus:
endpoint: {{ .Values.kafkaService | quote }}
kind: kafka
@@ -68,7 +68,7 @@
kafka:
class: kafkaloghandler.KafkaLogHandler
bootstrap_servers:
- - "cord-kafka:9092"
+ - "{{ .Values.kafkaService }}:9092"
topic: xos.log.volt
loggers:
'':
diff --git a/xos-services/volt/values.yaml b/xos-services/volt/values.yaml
index b5023e1..c91144c 100644
--- a/xos-services/volt/values.yaml
+++ b/xos-services/volt/values.yaml
@@ -32,6 +32,7 @@
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+xosCoreService: "xos-core:50051"
volthaRestService: "voltha.voltha.svc.cluster.local"
onosRestService: "onos-ui.default.svc.cluster.local"