From 4741afb6a2f1c94481ee73406b9590456a4e8c0f Mon Sep 17 00:00:00 2001
From: mahendrr <mahendra.raghuwanshi@amdocs.com>
Date: Fri, 3 May 2019 08:51:40 +0000
Subject: Enable AAI to authenticate with cassandra

Change-Id: Ib46fa0fd6f33e56556f7c4f9e244049085e4e9d2
Issue-ID: OOM-1835
Signed-off-by: mahendrr <mahendra.raghuwanshi@amdocs.com>
---
 charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml    | 2 ++
 .../aai-graphadmin/resources/config/janusgraph-cached.properties  | 2 ++
 .../resources/config/janusgraph-realtime.properties               | 2 ++
 .../aai-resources/resources/config/janusgraph-cached.properties   | 2 ++
 .../aai-resources/resources/config/janusgraph-realtime.properties | 2 ++
 .../aai-traversal/resources/config/janusgraph-cached.properties   | 2 ++
 .../aai-traversal/resources/config/janusgraph-realtime.properties | 2 ++
 values.yaml                                                       | 8 ++++++--
 8 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml b/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
index 3977a68..08390b6 100644
--- a/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
+++ b/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
@@ -50,6 +50,8 @@ xsi:schemaLocation="
         <entry key="storage.cassandra.replication-factor" value="{{ .Values.global.cassandra.replicas }}"/>
         <entry key="storage.cassandra.replication-strategy-class" value="org.apache.cassandra.locator.SimpleStrategy"/>
         <entry key="storage.hostname" value="{{ .Values.global.cassandra.serviceName }}"/>
+        <entry key="storage.username" value="{{ .Values.global.cassandra.username }}"/>
+        <entry key="storage.password" value="{{ .Values.global.cassandra.password }}"/>
     </util:map>
 
     <!-- Janus Implementation -->
diff --git a/charts/aai-graphadmin/resources/config/janusgraph-cached.properties b/charts/aai-graphadmin/resources/config/janusgraph-cached.properties
index 82e7ea9..a943ba0 100644
--- a/charts/aai-graphadmin/resources/config/janusgraph-cached.properties
+++ b/charts/aai-graphadmin/resources/config/janusgraph-cached.properties
@@ -24,6 +24,8 @@ query.smart-limit=false
 
 storage.backend=cassandra
 storage.hostname={{.Values.global.cassandra.serviceName}}
+storage.username={{.Values.global.cassandra.username}}
+storage.password={{.Values.global.cassandra.password}}
 
 storage.cassandra.keyspace=aaigraph
 
diff --git a/charts/aai-graphadmin/resources/config/janusgraph-realtime.properties b/charts/aai-graphadmin/resources/config/janusgraph-realtime.properties
index e9e9a9e..95e1939 100644
--- a/charts/aai-graphadmin/resources/config/janusgraph-realtime.properties
+++ b/charts/aai-graphadmin/resources/config/janusgraph-realtime.properties
@@ -23,6 +23,8 @@ query.smart-limit=false
 storage.backend=cassandra
 storage.hostname={{.Values.global.cassandra.serviceName}}
 storage.cassandra.keyspace=aaigraph
+storage.username={{.Values.global.cassandra.username}}
+storage.password={{.Values.global.cassandra.password}}
 
 storage.cassandra.read-consistency-level=LOCAL_QUORUM
 storage.cassandra.write-consistency-level=LOCAL_QUORUM
diff --git a/charts/aai-resources/resources/config/janusgraph-cached.properties b/charts/aai-resources/resources/config/janusgraph-cached.properties
index 9dc6636..5b9fd07 100644
--- a/charts/aai-resources/resources/config/janusgraph-cached.properties
+++ b/charts/aai-resources/resources/config/janusgraph-cached.properties
@@ -28,6 +28,8 @@ query.smart-limit=false
 storage.backend=cassandra
 storage.hostname={{.Values.global.cassandra.serviceName}}
 storage.cassandra.keyspace=aaigraph
+storage.username={{.Values.global.cassandra.username}}
+storage.password={{.Values.global.cassandra.password}}
 
 storage.cassandra.read-consistency-level=LOCAL_QUORUM
 storage.cassandra.write-consistency-level=LOCAL_QUORUM
diff --git a/charts/aai-resources/resources/config/janusgraph-realtime.properties b/charts/aai-resources/resources/config/janusgraph-realtime.properties
index 8791a0b..3b99d8a 100644
--- a/charts/aai-resources/resources/config/janusgraph-realtime.properties
+++ b/charts/aai-resources/resources/config/janusgraph-realtime.properties
@@ -26,6 +26,8 @@ query.smart-limit=false
 storage.backend=cassandra
 storage.hostname={{.Values.global.cassandra.serviceName}}
 storage.cassandra.keyspace=aaigraph
+storage.username={{.Values.global.cassandra.username}}
+storage.password={{.Values.global.cassandra.password}}
 
 storage.cassandra.read-consistency-level=LOCAL_QUORUM
 storage.cassandra.write-consistency-level=LOCAL_QUORUM
diff --git a/charts/aai-traversal/resources/config/janusgraph-cached.properties b/charts/aai-traversal/resources/config/janusgraph-cached.properties
index 9dc6636..5b9fd07 100644
--- a/charts/aai-traversal/resources/config/janusgraph-cached.properties
+++ b/charts/aai-traversal/resources/config/janusgraph-cached.properties
@@ -28,6 +28,8 @@ query.smart-limit=false
 storage.backend=cassandra
 storage.hostname={{.Values.global.cassandra.serviceName}}
 storage.cassandra.keyspace=aaigraph
+storage.username={{.Values.global.cassandra.username}}
+storage.password={{.Values.global.cassandra.password}}
 
 storage.cassandra.read-consistency-level=LOCAL_QUORUM
 storage.cassandra.write-consistency-level=LOCAL_QUORUM
diff --git a/charts/aai-traversal/resources/config/janusgraph-realtime.properties b/charts/aai-traversal/resources/config/janusgraph-realtime.properties
index 8791a0b..3b99d8a 100644
--- a/charts/aai-traversal/resources/config/janusgraph-realtime.properties
+++ b/charts/aai-traversal/resources/config/janusgraph-realtime.properties
@@ -26,6 +26,8 @@ query.smart-limit=false
 storage.backend=cassandra
 storage.hostname={{.Values.global.cassandra.serviceName}}
 storage.cassandra.keyspace=aaigraph
+storage.username={{.Values.global.cassandra.username}}
+storage.password={{.Values.global.cassandra.password}}
 
 storage.cassandra.read-consistency-level=LOCAL_QUORUM
 storage.cassandra.write-consistency-level=LOCAL_QUORUM
diff --git a/values.yaml b/values.yaml
index 75f372e..0d6589d 100644
--- a/values.yaml
+++ b/values.yaml
@@ -63,10 +63,14 @@ global: # global defaults
     #Override it to aai-cassandra if localCluster is enabled.
     serviceName: cassandra
 
-    #This should be same as shared cassandra instance or if localCluster is enabled 
-    #then it should be same as aai-cassandra replicaCount 
+    #This should be same as shared cassandra instance or if localCluster is enabled
+    #then it should be same as aai-cassandra replicaCount
     replicas: 3
 
+    #Cassanara login details
+    username: cassandra
+    password: cassandra
+
   aai:
     serviceName: aai
   babel:
-- 
cgit 1.2.3-korg