1 files changed, 14 insertions, 16 deletions
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
index 72c35e6603..d1797a407e 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
@@ -20,7 +20,7 @@
 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}}
@@ -34,25 +34,25 @@ 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 }}
+{{- end }}
 
 {{- if .Values.config.janusgraph.cassandraDriver }}
 storage.cql.internal.string-configuration = datastax-java-driver { {{ .Values.config.janusgraph.cassandraDriver.configuration }} }
 {{- end }}
 
-{{ else }}
+{{- else -}}
 
-{{ if .Values.global.config.storage }}
+{{- 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 }}
@@ -60,13 +60,13 @@ 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" }}
+{{- else if eq .Values.global.config.storage.backend "hbase" }}
 
 storage.hostname={{ .Values.global.config.storage.hostname }}
 storage.hbase.table={{ .Values.global.config.storage.name }}
@@ -75,11 +75,9 @@ storage.connection-timeout={{ .Values.global.config.storage.connectionTimeout |
 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
 # Setting db-cache to false ensure the fastest propagation of changes across servers
@@ -87,6 +85,6 @@ cache.db-cache=false
 #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 }}