diff options
Diffstat (limited to 'kubernetes/pomba')
7 files changed, 20 insertions, 15 deletions
diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/values.yaml b/kubernetes/pomba/charts/pomba-aaictxbuilder/values.yaml index 72692d9d4e..78c5367b8b 100644 --- a/kubernetes/pomba/charts/pomba-aaictxbuilder/values.yaml +++ b/kubernetes/pomba/charts/pomba-aaictxbuilder/values.yaml @@ -38,8 +38,8 @@ config: aaiUsername: AAI aaiPassword: OBF:1gfr1ev31gg7 aaiHttpProtocol: https - aaiConnectionTimeout: 5000 - aaiReadTimeout: 1000 + aaiConnectionTimeout: 60000 + aaiReadTimeout: 60000 # HTTP Basic Authorization credentials for Rest Service API httpUserId: admin httpPassword: OBF:1u2a1toa1w8v1tok1u30 diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties index 7a119f9267..eab3864168 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties +++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties @@ -23,6 +23,6 @@ key.store.password=70c87528c88dcd9f9c2558d30e817868 key.store.type=PKCS12 key.manager.factory.algorithm=SunX509 security.protocol=TLS -connection.timeout.ms=15000 -read.timeout.ms=10000 +connection.timeout.ms=60000 +read.timeout.ms=60000 base.uri=/aaicontextbuilder/service/context diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties index 80167d2257..9a27a6c8c8 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties +++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdc.properties @@ -22,6 +22,6 @@ key.store.password=70c87528c88dcd9f9c2558d30e817868 key.store.type=PKCS12 key.manager.factory.algorithm=SunX509 security.protocol=TLS -connection.timeout.ms=15000 -read.timeout.ms=10000 +connection.timeout.ms=60000 +read.timeout.ms=60000 base.uri=/sdccontextbuilder/service/context diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/application.properties b/kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/application.properties index 7eacd187aa..08879c5606 100644 --- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-sdcctxbuilder/resources/config/application.properties @@ -36,7 +36,7 @@ sdcConnect.consumerID={{ .Values.config.sdcConsumerId }} sdcConnect.sdcAddress={{ .Values.config.sdcServiceName }}.{{.Release.Namespace}}:{{ .Values.config.sdcPort }} # Minimum timeout value is 15 seconds; default is 120000s -sdcConnect.timeout.seconds=12000 +sdcConnect.timeout.seconds=60000 # {0} = UUID sdc.url.template=/sdc/v1/catalog/services/{0}/toscaModel diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml b/kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml index f85490dc12..b813288baa 100644 --- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml +++ b/kubernetes/pomba/charts/pomba-sdcctxbuilder/values.yaml @@ -39,7 +39,7 @@ debugEnabled: false 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 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 |