Merge "Upgrade VNFSDK to use common Postgres charts"

[oom.git] / kubernetes / aai / charts / aai-champ / resources / config / dynamic / conf / champ-beans.xml

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 6a66811..325982b 100644 (file)
--- 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
@@ -1,3 +1,19 @@
+<!--
+# Copyright © 2018 Amdocs, Bell Canada, AT&T
+#
+# 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.
+-->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:util="http://www.springframework.org/schema/util"
@@ -11,7 +27,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>
 
@@ -21,9 +37,8 @@ xsi:schemaLocation="
         <entry key="champcore.event.stream.publisher-pool-size" value="10" value-type="java.lang.Integer"/>
         <entry key="champcore.event.stream.publisher" value-ref="champEventPublisher"/>
 
-        <entry key="graph.name" value="aaigraph.dev"/>
+        <entry key="graph.name" value="aaigraph"/>
         <entry key="storage.backend" value="cassandra"/>
-        <entry key="storage.cassandra.keyspace" value="aaigraph"/>
         <entry key="storage.cassandra.read-consistency-level" value="LOCAL_QUORUM"/>
         <entry key="storage.cassandra.write-consistency-level" value="LOCAL_QUORUM"/>
         <entry key="storage.cassandra.replication-factor" value="3"/>
@@ -31,13 +46,12 @@ xsi:schemaLocation="
 
         {{- $seed_size := default 1 .Values.global.cassandra.replicas | int -}}
         {{- $global := . }}
-        <entry key="storage.hostname" value="{{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }}"/>
-        <entry key="storage.port" value="9160"/>
+        <entry key="storage.hostname" value="{{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-{{$global.Values.global.cassandra.serviceName}}-{{ $i }}.{{$global.Values.global.cassandra.serviceName}},{{- end }}"/>
     </util:map>
 
     <!-- Janus Implementation -->
     <bean id="graphBuilder" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl$Builder">
-        <constructor-arg value="aaigraph.dev"/>
+        <constructor-arg value="aaigraph"/>
         <constructor-arg ref="props" />
     </bean>