summaryrefslogtreecommitdiffstats
path: root/charts/aai-sparky-be
diff options
context:
space:
mode:
authorArul.Nambi <arul.nambi@amdocs.com>2018-07-17 16:02:30 -0400
committerBorislav Glozman <Borislav.Glozman@amdocs.com>2018-07-18 16:21:35 +0000
commit1996ca0d6cdbee6484d1490735b7ff566f3aa7b3 (patch)
tree212c183f6205b98b250c25c982ba6e2677e83aa4 /charts/aai-sparky-be
parentb952f86426d8b543a35e95851169337ed9e11fe2 (diff)
AAI-UI es index are not getting populated
This change request contains the following fixes 1) SSL exception when contacting search service 2) AAI not posting to DMaap as it could not contact message-router 3) Search service unable to reach elastic search 4) Index name different between synapse and AAI-UI 5) Sparky starting before es which leads to the indexes not being created 6) Changing the DMaaP topic on synapse to listen to the ones posted by AAI Issue-ID: OOM-1290 Change-Id: I8126755c50f6842d8aee429436fb57b8b96a3819 Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com> (cherry picked from commit 01a80afbf5e04b9c05b3f590d643c81b16088b3b)
Diffstat (limited to 'charts/aai-sparky-be')
-rw-r--r--charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml8
-rw-r--r--charts/aai-sparky-be/templates/deployment.yaml19
2 files changed, 23 insertions, 4 deletions
diff --git a/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml b/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
index 0763f94..29eb4a3 100644
--- a/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
+++ b/charts/aai-sparky-be/resources/config/spring-beans/sparky-core-sync.xml
@@ -142,7 +142,7 @@
<map>
<entry key="aggregate_generic-vnf_index">
<bean class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="aggregate_generic-vnf_index" />
+ <property name="indexName" value="aggregate-vnf-index" />
<property name="indexDocType" value="default" />
<property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" />
</bean>
@@ -212,7 +212,7 @@
</bean>
<bean id="autoSuggestionEntitySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="entityautosuggestindex" />
+ <property name="indexName" value="entity-autosuggest-index" />
<property name="indexDocType" value="default" />
<property name="indexMappingsFileName" value="/schemas/autoSuggestMappings.json" />
<property name="indexSettingsFileName" value="/schemas/autoSuggestSettings.json" />
@@ -296,7 +296,7 @@
</bean>
<bean id="geoEntitySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="topographicalsearchindex" />
+ <property name="indexName" value="topography-search-index" />
<property name="indexDocType" value="default" />
<property name="indexMappingsFileName" value="/schemas/dynamicMappings.json" />
</bean>
@@ -336,7 +336,7 @@
</bean>
<bean id="viewInspectySchemaConfig" class="org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig">
- <property name="indexName" value="entitysearchindex" />
+ <property name="indexName" value="entity-search-index" />
<property name="indexDocType" value="default" />
<property name="indexMappingsFileName" value="/schemas/es_mappings.json" />
<property name="indexSettingsFileName" value="/schemas/es_settings.json" />
diff --git a/charts/aai-sparky-be/templates/deployment.yaml b/charts/aai-sparky-be/templates/deployment.yaml
index b459646..b9de92b 100644
--- a/charts/aai-sparky-be/templates/deployment.yaml
+++ b/charts/aai-sparky-be/templates/deployment.yaml
@@ -34,6 +34,25 @@ spec:
release: {{ .Release.Name }}
name: {{ include "common.name" . }}
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - aai-elasticsearch
+ - --container-name
+ - aai-search-data
+ - --container-name
+ - aai
+ 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: "{{ include "common.repository" . }}/{{ .Values.image }}"