From 5ea1db3c031c6d753d2c2b170a3e1ccc1668a2d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Konrad=20Ba=C5=84ka?= Date: Mon, 6 Apr 2020 14:32:46 +0200 Subject: [PATCH] [SDNC] Provide hardcoded aaiclient.properties file via helm MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Change-Id: I8ed73f49092912419794abac1f8ccd6325672eb5 --- kubernetes/sdnc/templates/statefulset.yaml | 4 ++++ kubernetes/sdnc/values.yaml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index da5d8f30d4..4511ca9125 100644 --- 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 8cb7c339c7..99ff4b7760 100644 --- 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 -- 2.16.6