diff options
| author |   Mahendra Raghuwanshi <mahendra.raghuwanshi@amdocs.com> | 2019-03-15 12:02:42 +0000 |
|---|---|---|
| committer | mahendrr <mahendra.raghuwanshi@amdocs.com> | 2019-04-17 03:59:20 +0000 |
| commit | 6b77b72f56094248bbf0cc3cd849afd58450edb1 (patch) | |
| tree | 6504fb565b08c097143636c627bbd3e19a422225 /kubernetes/aai/charts/aai-champ | |
| parent | 714f651dd19530510b74e29aa4a5ab084883d0dd (diff) | |
Upgrade AAI to use common shared Cassandra
Change-Id: I0186b09697f32115595383c4e409e608e2cf767f
Issue-ID: OOM-1652
Signed-off-by: Mahendra Raghuwanshi <mahendra.raghuwanshi@amdocs.com>
Diffstat (limited to 'kubernetes/aai/charts/aai-champ')
| -rw-r--r-- | kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml | 7 | ||||
| -rw-r--r-- | kubernetes/aai/charts/aai-champ/templates/deployment.yaml | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml b/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml index 38fd64c5dc..3977a68834 100644 --- a/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml +++ b/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml @@ -47,12 +47,9 @@ xsi:schemaLocation=" <entry key="storage.backend" value="cassandra"/> <entry key="storage.cassandra.read-consistency-level" value="LOCAL_QUORUM"/> <entry key="storage.cassandra.write-consistency-level" value="LOCAL_QUORUM"/> - <entry key="storage.cassandra.replication-factor" value="3"/> + <entry key="storage.cassandra.replication-factor" value="{{ .Values.global.cassandra.replicas }}"/> <entry key="storage.cassandra.replication-strategy-class" value="org.apache.cassandra.locator.SimpleStrategy"/> - - {{- $seed_size := default 1 .Values.global.cassandra.replicas | int -}} - {{- $global := . }} - <entry key="storage.hostname" value="{{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-{{$global.Values.global.cassandra.serviceName}}-{{ $i }}.{{$global.Values.global.cassandra.serviceName}},{{- end }}"/> + <entry key="storage.hostname" value="{{ .Values.global.cassandra.serviceName }}"/> </util:map> <!-- Janus Implementation --> diff --git a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml index 8e4d7f48cb..a311f68799 100644 --- a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml +++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml @@ -36,7 +36,11 @@ spec: - /root/ready.py args: - --container-name + {{- if .Values.global.cassandra.localCluster }} - aai-cassandra + {{- else }} + - cassandra + {{- end }} env: - name: NAMESPACE valueFrom: |