2 files changed, 12 insertions, 7 deletions
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties
index bce6710a5e..5b64f841e2 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties
@@ -32,14 +32,14 @@ basicAuth.username={{ .Values.config.serviceDecompositionUserId }}
 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
+aai.connectionTimeout=60000
+aai.readTimeout=60000
 aai.resourceList=vnfc,vserver,l3-network
 aai.serviceInstancePath=/aai/v13/nodes/service-instance/{0}
 
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
index a4b2c8b1d6..a1ef2725d8 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/values.yaml
@@ -34,6 +34,11 @@ debugEnabled: false
 # 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