From: James Forsyth <jf2512@att.com>
Date: Mon, 9 Apr 2018 19:23:12 +0000 (+0000)
Subject: Merge "Fix issue with Champ startup"
X-Git-Tag: 2.0.0-ONAP~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2c41376322b4dc3b2e8afc4d4ef7685439c3650a;hp=5660267c79737937583f7f13a97c518c0f4d6548;p=aai%2Ftest-config.git

Merge "Fix issue with Champ startup"
---

diff --git a/champ-service/dynamic/conf/champ-beans.xml b/champ-service/dynamic/conf/champ-beans.xml
index a239a80..e254ed9 100644
--- a/champ-service/dynamic/conf/champ-beans.xml
+++ b/champ-service/dynamic/conf/champ-beans.xml
@@ -25,16 +25,17 @@
         <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-onap.dev"/>
-        <entry key="storage.backend" value="hbase"/>
+        <entry key="graph.name" value="aaigraph"/>
+        <entry key="storage.backend" value="cassandra"/>
         <entry key="storage.hostname" value="aai.hbase.simpledemo.onap.org"/>
 
-        <!-- Hbase Config -->
+        <!-- Hbase Config 
         <entry key="storage.hbase.ext.hbase.zookeeper.property.clientPort" value="2181"/>
         <entry key="storage.hbase.ext.zookeeper.znode.parent" value="/hbase-unsecure"/>
+        -->
 
         <!-- Cassandra Config -->
-        <entry key="storage.port" value="2181"/>
+        <entry key="storage.port" value="9160"/>
     </util:map>
 
     <!-- Titan Implementation -->
diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 289d2d1..b5d4c61 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -155,7 +155,7 @@ services:
       - AJSC_JETTY_BLOCKING_QUEUE_SIZE=200
       - MAX_HEAP=1024
       - SERVICE_BEANS=/opt/app/champ-service/dynamic/conf
-      - GRAPHIMPL=titan-deps
+      - GRAPHIMPL=janus-deps
     logging:
       driver: "json-file"
       options: