Fix AAI endpoint configuration
Issue-ID: LOG-795
Change-Id: I46207d7db0a7ef992161cc579732982f518fbaaa
Signed-off-by: Geora Barsky <georab@amdocs.com>
diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml b/kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml
index f85490d..b813288 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml
+++ b/kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml
@@ -39,7 +39,7 @@
config:
#Application properties
sdcUsername: pomba
- sdcPassword: OBF:1uha1uh81w8v1ugi1ugg
+ sdcPassword: OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
sdcConsumerId: pomba
sdcServiceName: sdc-be
sdcPort: 8443
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties
index bce6710..f94f445 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties
@@ -32,11 +32,11 @@
basicAuth.password={{ .Values.config.serviceDecompositionPassword }}
# AAI REST Client Configuration
-aai.serviceName=127.0.0.1
-aai.servicePort=8443
-aai.username=AAI
-aai.password=OBF:1gfr1ev31gg7
-aai.httpProtocol=https
+aai.serviceName={{ .Values.config.aaiServiceName }}.{{.Release.Namespace}}
+aai.servicePort={{ .Values.config.aaiPort }}
+aai.username={{ .Values.config.aaiUsername }}
+aai.password={{ .Values.config.aaiPassword }}
+aai.httpProtocol={{ .Values.config.aaiHttpProtocol }}
aai.securityProtocol=TLS
aai.connectionTimeout=15000
aai.readTimeout=15000
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
index a4b2c8b..a1ef272 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
@@ -34,6 +34,11 @@
# Example:
config:
# Service Decomposition REST Client Configuration
+ aaiServiceName: aai
+ aaiPort: 8443
+ aaiUsername: AAI
+ aaiPassword: OBF:1gfr1ev31gg7
+ aaiHttpProtocol: https
# Basic Authorization Client credentials for Service Decomposition REST service
serviceDecompositionUserId: admin
serviceDecompositionPassword: OBF:1u2a1toa1w8v1tok1u30