From 75f2a5a26ea7e7ee656513529436fd8aa42fb66f Mon Sep 17 00:00:00 2001 From: vv770d Date: Mon, 26 Jul 2021 19:42:44 +0000 Subject: [DCAE] Fix PRH aai lookup url config envsubst was modifying application config containing ${} to null; introduced dummy variable as work-around to generate required config Change-Id: I596e542f4719880a4359de9ea82bbb80b9d87403 Signed-off-by: vv770d Issue-ID: DCAEGEN2-2869 Signed-off-by: vv770d (cherry picked from commit 5026ae342fbbfd52e53fd7d6f1715a4fd8220863) --- kubernetes/dcaegen2-services/components/dcae-prh/values.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml index d1f3f2a84a..5b608943ab 100644 --- a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml @@ -101,6 +101,8 @@ customEnvVars: value: "Basic `echo -n ${AAI_USER}:${AAI_PASSWORD} | base64`" # initial application configuration +# Configuration used for in-app substitution must be defined as $${undefined}{} under applicationConfig +# inorder to get ${} post envsubst (done part of dcae helm service-common templates) applicationConfig: dmaap.dmaapConsumerConfiguration.dmaapContentType: "application/json" dmaap.dmaapConsumerConfiguration.consumerId: "c12" @@ -118,7 +120,7 @@ applicationConfig: aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors: true aai.aaiClientConfiguration.aaiBasePath: "/aai/v12" aai.aaiClientConfiguration.aaiPnfPath: "/network/pnfs/pnf" - aai.aaiClientConfiguration.aaiServiceInstancePath: "/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}" + aai.aaiClientConfiguration.aaiServiceInstancePath: "/business/customers/customer/$${undefined}{customer}/service-subscriptions/service-subscription/$${undefined}{serviceType}/service-instances/service-instance/$${undefined}{serviceInstanceId}" aai.aaiClientConfiguration.aaiHeaders: X-FromAppId: "prh" X-TransactionId: "9999" -- cgit 1.2.3-korg