diff options
author | 2018-03-10 23:56:32 +0000 | |
---|---|---|
committer | 2018-04-18 00:05:32 +0000 | |
commit | 62ddc7d0fed0409351201012caba0b88386a7bb1 (patch) | |
tree | 5340b96973d3d50023a85465401c6c3ecb9b9ddc /charts/aai-champ | |
parent | f2b4966be5e2076fa975e53145ff637dfd6cbbcd (diff) |
Update from using hbase to using cassandra
Also update resources and traversal to remove chef
MK: Addressing the -1 statefulset comment
Issue-ID: AAI-33
Change-Id: Ieee819703764fdda727f17d4e9be43084886828c
Signed-off-by: Kajur, Harish vk250x@att.com <vk250x@att.com>
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'charts/aai-champ')
-rw-r--r-- | charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml | 15 | ||||
-rw-r--r-- | charts/aai-champ/templates/deployment.yaml | 15 |
2 files changed, 25 insertions, 5 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 f97ac16..6a66811 100644 --- a/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml +++ b/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml @@ -22,12 +22,17 @@ xsi:schemaLocation=" <entry key="champcore.event.stream.publisher" value-ref="champEventPublisher"/> <entry key="graph.name" value="aaigraph.dev"/> - <entry key="storage.backend" value="hbase"/> - <entry key="storage.hostname" value="aai-hbase.{{.Release.Namespace}}"/> + <entry key="storage.backend" value="cassandra"/> + <entry key="storage.cassandra.keyspace" value="aaigraph"/> + <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-strategy-class" value="org.apache.cassandra.locator.SimpleStrategy"/> - <!-- Hbase Config --> - <entry key="storage.hbase.ext.hbase.zookeeper.property.clientPort" value="2181"/> - <entry key="storage.hbase.ext.zookeeper.znode.parent" value="/hbase"/> + {{- $seed_size := default 1 .Values.global.cassandra.replicas | int -}} + {{- $global := . }} + <entry key="storage.hostname" value="{{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }}"/> + <entry key="storage.port" value="9160"/> </util:map> <!-- Janus Implementation --> diff --git a/charts/aai-champ/templates/deployment.yaml b/charts/aai-champ/templates/deployment.yaml index ccb9021..7176d09 100644 --- a/charts/aai-champ/templates/deployment.yaml +++ b/charts/aai-champ/templates/deployment.yaml @@ -30,6 +30,21 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - aai-resources + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}" |