Update the janusgraph properties for cassandra 3

Issue-ID: AAI-2731
Change-Id: Ic64ba3c97374db4f9ef0961b1e910714db49b4ae
Signed-off-by: Harish Venkata Kajur <vk250x@att.com>

8 files changed, 48 insertions, 53 deletions

diff --git a/components/aai-graphadmin/resources/config/janusgraph-cached.properties b/components/aai-graphadmin/resources/config/janusgraph-cached.properties
index a943ba0..232262e 100644
--- a/components/aai-graphadmin/resources/config/janusgraph-cached.properties
+++ b/components/aai-graphadmin/resources/config/janusgraph-cached.properties
@@ -22,17 +22,16 @@ query.smart-limit=false
 
 {{ if .Values.global.config.cluster.cassandra.dynamic }}
 
-storage.backend=cassandra
+storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
+storage.cql.keyspace=aaigraph
 storage.username={{.Values.global.cassandra.username}}
 storage.password={{.Values.global.cassandra.password}}
 
-storage.cassandra.keyspace=aaigraph
-
-storage.cassandra.read-consistency-level=LOCAL_QUORUM
-storage.cassandra.write-consistency-level=LOCAL_QUORUM
-storage.cassandra.replication-factor={{.Values.global.cassandra.replicas}}
-storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.SimpleStrategy
+storage.cql.read-consistency-level=LOCAL_QUORUM
+storage.cql.write-consistency-level=LOCAL_QUORUM
+storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
+storage.cql.only-use-local-consistency-for-system-operations=true
 
 {{ else }}
 
diff --git a/components/aai-graphadmin/resources/config/janusgraph-realtime.properties b/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
index 95e1939..923611d 100644
--- a/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
+++ b/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
@@ -20,16 +20,16 @@ query.smart-limit=false
 
 {{ if .Values.global.config.cluster.cassandra.dynamic }}
 
-storage.backend=cassandra
+storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
-storage.cassandra.keyspace=aaigraph
+storage.cql.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
-storage.cassandra.replication-factor={{.Values.global.cassandra.replicas}}
-storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.SimpleStrategy
+storage.cql.read-consistency-level=LOCAL_QUORUM
+storage.cql.write-consistency-level=LOCAL_QUORUM
+storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
+storage.cql.only-use-local-consistency-for-system-operations=true
 
 {{ else }}
 
diff --git a/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties b/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties
index ecfe54e..b8f9a7f 100644
--- a/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties
+++ b/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties
@@ -20,18 +20,16 @@ query.smart-limit=false
 
 {{- if eq .Values.global.jobs.migration.remoteCassandra.enabled false }}
 
-storage.backend=cassandra
-
-#In case of upgrades from Casablanca provide the override aai.global.cassandra.existingInstServiceName=aai-cassandra
+storage.backend=cql
 storage.hostname={{ .Values.global.cassandra.existingInstServiceName | default .Values.global.cassandra.serviceName }}
+storage.cql.keyspace=aaigraph
 storage.username={{.Values.global.cassandra.username}}
 storage.password={{.Values.global.cassandra.password}}
 
-storage.cassandra.keyspace=aaigraph
-storage.cassandra.read-consistency-level=LOCAL_QUORUM
-storage.cassandra.write-consistency-level=LOCAL_QUORUM
-storage.cassandra.replication-factor=3
-storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.SimpleStrategy
+storage.cql.read-consistency-level=LOCAL_QUORUM
+storage.cql.write-consistency-level=LOCAL_QUORUM
+storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
+storage.cql.only-use-local-consistency-for-system-operations=true
 {{- else }}
 {{- if .Values.global.jobs.migration.remoteCassandra.storage }}
 storage.backend={{ .Values.global.jobs.migration.remoteCassandra.storage.backend }}
diff --git a/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties b/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties
index 8ef28c9..4b7261e 100644
--- a/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties
+++ b/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties
@@ -20,18 +20,16 @@ query.smart-limit=false
 
 {{- if eq .Values.global.jobs.migration.remoteCassandra.enabled false }}
 
-storage.backend=cassandra
-
-#In case of upgrades from Casablanca provide the override aai.global.cassandra.existingInstServiceName=aai-cassandra
+storage.backend=cql
 storage.hostname={{ .Values.global.cassandra.existingInstServiceName | default .Values.global.cassandra.serviceName }}
+storage.cql.keyspace=aaigraph
 storage.username={{.Values.global.cassandra.username}}
 storage.password={{.Values.global.cassandra.password}}
 
-storage.cassandra.keyspace=aaigraph
-storage.cassandra.read-consistency-level=LOCAL_QUORUM
-storage.cassandra.write-consistency-level=LOCAL_QUORUM
-storage.cassandra.replication-factor=3
-storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.SimpleStrategy
+storage.cql.read-consistency-level=LOCAL_QUORUM
+storage.cql.write-consistency-level=LOCAL_QUORUM
+storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
+storage.cql.only-use-local-consistency-for-system-operations=true
 {{- else }}
 {{- if .Values.global.jobs.migration.remoteCassandra.storage }}
 storage.backend={{ .Values.global.jobs.migration.remoteCassandra.storage.backend }}
diff --git a/components/aai-resources/resources/config/janusgraph-cached.properties b/components/aai-resources/resources/config/janusgraph-cached.properties
index 5b9fd07..1db2774 100644
--- a/components/aai-resources/resources/config/janusgraph-cached.properties
+++ b/components/aai-resources/resources/config/janusgraph-cached.properties
@@ -25,16 +25,16 @@ query.smart-limit=false
 
 {{ if .Values.global.config.cluster.cassandra.dynamic }}
 
-storage.backend=cassandra
+storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
-storage.cassandra.keyspace=aaigraph
+storage.cql.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
-storage.cassandra.replication-factor={{.Values.global.cassandra.replicas}}
-storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.SimpleStrategy
+storage.cql.read-consistency-level=LOCAL_QUORUM
+storage.cql.write-consistency-level=LOCAL_QUORUM
+storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
+storage.cql.only-use-local-consistency-for-system-operations=true
 
 {{ else }}
 
diff --git a/components/aai-resources/resources/config/janusgraph-realtime.properties b/components/aai-resources/resources/config/janusgraph-realtime.properties
index 3b99d8a..36cbc42 100644
--- a/components/aai-resources/resources/config/janusgraph-realtime.properties
+++ b/components/aai-resources/resources/config/janusgraph-realtime.properties
@@ -23,16 +23,16 @@ query.smart-limit=false
 
 {{ if .Values.global.config.cluster.cassandra.dynamic }}
 
-storage.backend=cassandra
+storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
-storage.cassandra.keyspace=aaigraph
+storage.cql.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
-storage.cassandra.replication-factor={{.Values.global.cassandra.replicas}}
-storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.SimpleStrategy
+storage.cql.read-consistency-level=LOCAL_QUORUM
+storage.cql.write-consistency-level=LOCAL_QUORUM
+storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
+storage.cql.only-use-local-consistency-for-system-operations=true
 
 {{ else }}
 
diff --git a/components/aai-traversal/resources/config/janusgraph-cached.properties b/components/aai-traversal/resources/config/janusgraph-cached.properties
index 5b9fd07..1db2774 100644
--- a/components/aai-traversal/resources/config/janusgraph-cached.properties
+++ b/components/aai-traversal/resources/config/janusgraph-cached.properties
@@ -25,16 +25,16 @@ query.smart-limit=false
 
 {{ if .Values.global.config.cluster.cassandra.dynamic }}
 
-storage.backend=cassandra
+storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
-storage.cassandra.keyspace=aaigraph
+storage.cql.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
-storage.cassandra.replication-factor={{.Values.global.cassandra.replicas}}
-storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.SimpleStrategy
+storage.cql.read-consistency-level=LOCAL_QUORUM
+storage.cql.write-consistency-level=LOCAL_QUORUM
+storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
+storage.cql.only-use-local-consistency-for-system-operations=true
 
 {{ else }}
 
diff --git a/components/aai-traversal/resources/config/janusgraph-realtime.properties b/components/aai-traversal/resources/config/janusgraph-realtime.properties
index 3b99d8a..36cbc42 100644
--- a/components/aai-traversal/resources/config/janusgraph-realtime.properties
+++ b/components/aai-traversal/resources/config/janusgraph-realtime.properties
@@ -23,16 +23,16 @@ query.smart-limit=false
 
 {{ if .Values.global.config.cluster.cassandra.dynamic }}
 
-storage.backend=cassandra
+storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
-storage.cassandra.keyspace=aaigraph
+storage.cql.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
-storage.cassandra.replication-factor={{.Values.global.cassandra.replicas}}
-storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.SimpleStrategy
+storage.cql.read-consistency-level=LOCAL_QUORUM
+storage.cql.write-consistency-level=LOCAL_QUORUM
+storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
+storage.cql.only-use-local-consistency-for-system-operations=true
 
 {{ else }}