From 0157f090834427555ae5b23cf1ea1c19f0653812 Mon Sep 17 00:00:00 2001 From: Mohammadreza Pasandideh Date: Mon, 24 Sep 2018 07:40:47 -0400 Subject: [PATCH] Fix config file name for POMBA ND CNTXTB Remove SDNC CNTXTB config file from list Issue-ID: LOG-685, LOG-690 Change-Id: I3bd33415ea45ab2f17cf21f216dcc61d5b2beea4 Signed-off-by: Mohammadreza Pasandideh --- ...networkdiscovery.properties => ndcb.properties} | 0 .../resources/config/builders/sdnc.properties | 28 ---------------------- 2 files changed, 28 deletions(-) rename kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/{networkdiscovery.properties => ndcb.properties} (100%) delete mode 100755 kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/networkdiscovery.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/networkdiscovery.properties rename to kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.properties deleted file mode 100755 index f06d335213..0000000000 --- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/sdnc.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.config.sdncCtxBuilderHost }} -basicauth.username={{ .Values.config.sdncCtxBuilderUsername }} -basicauth.password={{ .Values.config.sdncCtxBuilderPassword }} -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=15000 -read.timeout.ms=10000 -base.uri=/sdnccontextbuilder/service/context - -- 2.16.6