Merge "Bump up version to 1.3.0-SNAPSHOT"

[oom.git] / kubernetes / pomba / charts / pomba-servicedecomposition / resources / config / application.properties

diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties
index 26737f5..bbf0901 100644 (file)
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties
@@ -32,19 +32,22 @@ basicAuth.username={{ .Values.config.serviceDecompositionUserId }}
 basicAuth.password={{ .Values.config.serviceDecompositionPassword }}
 
 # AAI REST Client Configuration
-aai.host=127.0.0.1
-aai.port=8443
-aai.httpProtocol=http
-aai.trustStorePath=tomcat_keystore
-aai.keyStorePath=aai-client-cert.p12
-aai.keyStorePassword=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-aai.keyManagerFactoryAlgorithm=SunX509
-aai.keyStoreType=PKCS12
+aai.serviceName={{ .Values.config.aaiServiceName }}.{{.Release.Namespace}}
+aai.servicePort={{ .Values.config.aaiPort }}
+# AAI APIs authentication mode. Valid values: [basic_auth, client_cert]
+aai.authentication=basic_auth
+aai.trustStorePath=n/a
+aai.keyStorePath=n/a
+aai.keyStorePassword=n/a
+aai.username={{ .Values.config.aaiUsername }}
+aai.password={{ .Values.config.aaiPassword }}
+aai.httpProtocol={{ .Values.config.aaiHttpProtocol }}
 aai.securityProtocol=TLS
-aai.connectionTimeout=5000
-aai.readTimeout=1000
-aai.resourceList=vnfc,vserver,l3-network
+aai.connectionTimeout=60000
+aai.readTimeout=60000
+aai.resourceList=vnfc,vserver,l3-network,pserver
 aai.serviceInstancePath=/aai/v13/nodes/service-instance/{0}
+aai.urlDepth=2
 
 #Servlet context parameters
 server.context_parameters.p-name=value #context parameter with p-name as key and value as value.