From: Alexis de Talhouët <alexis.de_talhouet@bell.ca>
Date: Tue, 25 Sep 2018 17:13:39 +0000 (+0000)
Subject: Merge "Fix config file name for POMBA ND CNTXTB"
X-Git-Tag: 3.0.0-ONAP~257
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b4192f2d1933b86ce500fa42c9552cd8920acbc3;hp=32a9559270bee011d39e049133441ea93df4d025;p=oom.git

Merge "Fix config file name for POMBA ND CNTXTB"
---

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
-