summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-05-09 18:18:00 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-09 18:18:00 +0000
commit7029f12c6a6dc203d132fcbc5c4660c20f086357 (patch)
tree492a6eba94bd3d734081789215d420ed653ccb62 /kubernetes
parent54eab4210462d9b414fe07600b93dee450f0e14e (diff)
parentf923b2e9758f75591b4a0c2201715cd5a391538b (diff)
Merge "Fix message-router-kafka references"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml2
-rw-r--r--kubernetes/aai/charts/aai-champ/templates/deployment.yaml2
-rwxr-xr-xkubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml b/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
index a271402637..b3d7bc22b8 100644
--- a/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
+++ b/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
@@ -11,7 +11,7 @@ xsi:schemaLocation="
<!-- Event publisher to pass to the Champ library for logging raw graph
events (Kafka implementation). -->
<bean id="champEventPublisher" class="org.onap.aai.event.client.KafkaEventPublisher" >
- <constructor-arg name="hosts" value="global-kafka.{{.Release.Namespace}}:9092" />
+ <constructor-arg name="hosts" value="message-router-kafka.{{.Release.Namespace}}:9092" />
<constructor-arg name="topic" value="champRawEvents" />
</bean>
diff --git a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
index d7fde324ae..0941f44be4 100644
--- a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
- --container-name
- aai-resources
- --container-name
- - global-kafka
+ - message-router-kafka
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
index 6630117e92..fd4587551d 100755
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
+++ b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
@@ -1,4 +1,4 @@
-kafkapod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "message-router-global-kafka-[^[:space:]]*")
+kafkapod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "message-router-kafka-[^[:space:]]*")
if [ -n "$kafkapod" ]; then
if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $kafkapod -- ps ef | grep -i kafka; then
echo Success. Kafka process is running. 2>&1