From c07e737bdf497431e2573ff11067e87207da157d Mon Sep 17 00:00:00 2001 From: Norm Traxler Date: Mon, 17 Dec 2018 17:59:43 +0000 Subject: Fix OOM for Network Discovery update NDCB image and correct ND external port Enable Context Aggregator Network Discovery. Update docker image to 1.4.1-latest (master branch build) Issue-ID: SDNC-375 Change-Id: I3546e39d5a9c8dd727b934433b579ee684640489 Signed-off-by: Norm Traxler --- .../resources/config/builders/ndcb.properties | 28 ++++++++++++++++++++++ .../config/future-builders/ndcb.properties | 28 ---------------------- 2 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties delete mode 100755 kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties (limited to 'kubernetes/pomba/charts/pomba-contextaggregator') diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties new file mode 100644 index 0000000000..f07cb65c31 --- /dev/null +++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties @@ -0,0 +1,28 @@ +# Copyright © 2018 Amdocs +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +server.host={{ .Values.global.networkdiscoveryCtxBuilderHost }} +basicauth.username={{ .Values.config.networkdiscoveryCtxBuilderUsername }} +basicauth.password={{ .Values.config.networkdiscoveryCtxBuilderPassword }} +server.port={{ .Values.config.ctxBuilderExternalPort }} +server.protocol=http +trust.store.path=/auth/tomcat_keystore +key.store.path=/auth/aai-client-cert.p12 +key.store.password=70c87528c88dcd9f9c2558d30e817868 +key.store.type=PKCS12 +key.manager.factory.algorithm=SunX509 +security.protocol=TLS +connection.timeout.ms=60000 +read.timeout.ms=60000 +base.uri=/ndcontextbuilder/service/context diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties deleted file mode 100755 index f07cb65c31..0000000000 --- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright © 2018 Amdocs -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -server.host={{ .Values.global.networkdiscoveryCtxBuilderHost }} -basicauth.username={{ .Values.config.networkdiscoveryCtxBuilderUsername }} -basicauth.password={{ .Values.config.networkdiscoveryCtxBuilderPassword }} -server.port={{ .Values.config.ctxBuilderExternalPort }} -server.protocol=http -trust.store.path=/auth/tomcat_keystore -key.store.path=/auth/aai-client-cert.p12 -key.store.password=70c87528c88dcd9f9c2558d30e817868 -key.store.type=PKCS12 -key.manager.factory.algorithm=SunX509 -security.protocol=TLS -connection.timeout.ms=60000 -read.timeout.ms=60000 -base.uri=/ndcontextbuilder/service/context -- cgit 1.2.3-korg