[SDNC] Provide hardcoded aaiclient.properties file via helm

Currently /opt/onap/ccsdk/data/properties directory with its
configfiles is saved in sdnc image and not provided via helm.
File "aaiclient.properties" stored there appears to be used for
determining AAI URI by directed graphs. In this patch,
aaiclient.properties provided by configmap is added to this directory,
with still being passed to previous one. This helps with following
error you could see in karaf logs:
2020-04-06T11:18:12,714 | WARN  | qtp1411815619-117 | AAIService | 218 - org.onap.ccsdk.sli.adaptors.aai-service-provider - 0.7.1 |  - 33 (update) | java.net.UnknownHostException: aai.api.simpledemo.onap.org

Issue-ID: SDNC-1130
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I8ed73f49092912419794abac1f8ccd6325672eb5

diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index da5d8f3..4511ca9 100644 (file)
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -1,4 +1,5 @@
 {{/*
+# Copyright © 2020 Samsung Electronics
 # Copyright © 2017 Amdocs, Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -208,6 +209,9 @@ spec:
           - mountPath: {{ .Values.config.binDir }}/installSdncDb.sh
             name: bin
             subPath: installSdncDb.sh
+          - mountPath: {{ .Values.config.ccsdkConfigDir }}/aaiclient.properties
+            name: properties
+            subPath: aaiclient.properties
           - mountPath: {{ .Values.config.configDir }}/aaiclient.properties
             name: properties
             subPath: aaiclient.properties

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 8cb7c33..99ff4b7 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -1,3 +1,4 @@
+# Copyright © 2020 Samsung Electronics
 # Copyright © 2017 Amdocs, Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -159,6 +160,7 @@ config:
   peerODLCluster: 127.0.0.1
   isPrimaryCluster: true
   configDir: /opt/onap/sdnc/data/properties
+  ccsdkConfigDir: /opt/onap/ccsdk/data/properties
   dmaapTopic: SUCCESS
   dmaapPort: 3904
   logstashServiceName: log-ls