1 files changed, 15 insertions, 27 deletions
diff --git a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
index 36940a8921..1f46755b83 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
@@ -16,12 +16,10 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 */}}
-
 query.fast-property=true
 query.smart-limit=false
 
-{{ if .Values.global.config.cluster.cassandra.dynamic }}
-
+{{- if .Values.global.config.cluster.cassandra.dynamic }}
 storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
 storage.username={{.Values.global.cassandra.username}}
@@ -34,21 +32,16 @@ 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
 
-{{ if .Values.global.cassandra.partitionerName }}
+{{- if .Values.global.cassandra.partitionerName }}
 storage.cql.partitioner-name={{ .Values.global.cassandra.partitionerName }}
-{{ end }}
-
-{{ else }}
-
-{{ if .Values.global.config.storage }}
-
+{{- end }}
+{{- else -}}
+{{- if .Values.global.config.storage }}
 storage.backend={{ .Values.global.config.storage.backend }}
-
-{{ if eq .Values.global.config.storage.backend "cql" }}
-
+{{- if eq .Values.global.config.storage.backend "cql" }}
 storage.hostname={{ .Values.global.config.storage.hostname }}
 storage.cql.keyspace={{ .Values.global.config.storage.name }}
-storage.cql.local-datacenter={{ .Values.global.config.storage.localDataCenter }}
+storage.cql.local-datacenter={{ .Values.global.cassandra.localDataCenter }}
 
 storage.cql.read-consistency-level={{ .Values.global.config.storage.cql.readConsistency }}
 storage.cql.write-consistency-level={{ .Values.global.config.storage.cql.readConsistency }}
@@ -56,26 +49,21 @@ storage.cql.replication-factor={{ .Values.global.config.storage.cql.replicationF
 
 storage.cql.only-use-local-consistency-for-system-operations={{ .Values.global.config.storage.cql.localConsistencyForSysOps }}
 storage.cql.cluster-name={{ .Values.global.config.storage.clusterName }}
-storage.cql.local-datacenter={{ .Values.global.config.storage.localDataCenter }}
+storage.cql.local-datacenter={{ .Values.global.cassandra.localDataCenter }}
 
 storage.connection-timeout={{ .Values.global.config.storage.connectionTimeout | int }}
 cache.tx-cache-size={{ .Values.global.config.storage.cacheSize | int }}
 log.tx.key-consistent={{ .Values.global.config.storage.keyConsistent }}
-
 {{ else if eq .Values.global.config.storage.backend "hbase" }}
-
 storage.hostname={{ .Values.global.config.storage.hostname }}
 storage.hbase.table={{ .Values.global.config.storage.name }}
 
 storage.connection-timeout={{ .Values.global.config.storage.connectionTimeout | int }}
 cache.tx-cache-size={{ .Values.global.config.storage.cacheSize | int }}
 log.tx.key-consistent={{ .Values.global.config.storage.keyConsistent }}
-
-{{ end }}
-
-{{ end }}
-
-{{ end }}
+{{- end }}
+{{- end }}
+{{- end }}
 
 storage.lock.wait-time=300
 
@@ -83,16 +71,16 @@ storage.lock.wait-time=300
 # Setting db-cache to false will ensure the fastest propagation of changes across servers
 # Setting db-cache to true will ensure fastest response times
 cache.db-cache={{ .Values.config.janusgraph.caching.enabled }}
-{{ if .Values.config.janusgraph.caching.enabled }}
+{{- if .Values.config.janusgraph.caching.enabled }}
 # cache-time in milliseconds
 cache.db-cache-time={{ .Values.config.janusgraph.caching.dbCacheTime }}
 cache.db-cache-size={{ .Values.config.janusgraph.caching.dbCacheSize }}
 cache.db-cache-clean-wait={{ .Values.config.janusgraph.caching.dbCacheCleanWait }}
-{{ end }}
+{{- end }}
 
 #load graphson file on startup
 load.snapshot.file=false
 
-{{ if .Values.config.janusgraph.allowUpgrade }}
+{{- if .Values.config.janusgraph.allowUpgrade }}
 graph.allow-upgrade=true
-{{ end }}
+{{- end }}