X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fcharts%2Faai-champ%2Fresources%2Fconfig%2Fdynamic%2Fconf%2Fchamp-beans.xml;h=9d7ddd1af154994918e44d6f15e7c7b27e1af4aa;hb=c9ce8f4ada3cdb2b42105bf513351b55e17a7d90;hp=f97ac16864ba161ec70c222926b8e4e002c6be36;hpb=53e753207dc7f84726bd4d7819904382e071c9cd;p=oom.git

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 f97ac16864..9d7ddd1af1 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
@@ -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,18 +37,22 @@ 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="storage.backend" value="hbase"/>
-        <entry key="storage.hostname" value="aai-hbase.{{.Release.Namespace}}"/>
+        <entry key="graph.name" value="aaigraph"/>
+        <entry key="storage.backend" value="cassandra"/>
+        <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"/>
+        <entry key="storage.cassandra.replication-strategy-class" value="org.apache.cassandra.locator.SimpleStrategy"/>
 
-        <!-- Hbase Config -->
-        <entry key="storage.hbase.ext.hbase.zookeeper.property.clientPort" value="2181"/>
-        <entry key="storage.hbase.ext.zookeeper.znode.parent" value="/hbase"/>
+        {{- $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"/>
     </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>