diff options
author | 2021-09-24 08:30:35 +0000 | |
---|---|---|
committer | 2021-09-24 08:30:35 +0000 | |
commit | eb99408cc3b8b9bff1baac9047c806ab1051f94e (patch) | |
tree | d7b4f2a64b8151e105cbc685b14ba3e576f912a9 /kubernetes/cps/components/ncmp-dmi-plugin/resources/config | |
parent | ea0e91a44cadf22ed8299418741f45c01dab02d5 (diff) | |
parent | bcacd7748bd62a84a33cd4e8324fee0c19323374 (diff) |
Merge "[CPS] Fix issues in the ncmp-dmi-plugin charts"
Diffstat (limited to 'kubernetes/cps/components/ncmp-dmi-plugin/resources/config')
-rw-r--r-- | kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml | 12 | ||||
-rw-r--r-- | kubernetes/cps/components/ncmp-dmi-plugin/resources/config/logback.xml | 36 |
2 files changed, 6 insertions, 42 deletions
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml index d388823f9e..2e5018807c 100644 --- a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml +++ b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml @@ -18,19 +18,19 @@ # ============LICENSE_END========================================================= */}} -server: - port: 8080 +dmi: + service: + name: {{ .Values.config.dmiServiceName }} cps-core: - baseUrl: http://${CPS_CORE_HOST:cps}:${CPS_CORE_PORT:8080} - dmiRegistrationUrl : /cps-ncmp/api/ncmp-dmi/v1/ch + baseUrl: {{ .Values.config.cpsCore.url }} auth: username: ${CPS_CORE_USERNAME} password: ${CPS_CORE_PASSWORD} sdnc: - baseUrl: http://${SDNC_HOST:sdnc}:${SDNC_PORT:8181} - topologyId: ${SDNC_TOPOLOGY_ID:topology-netconf} + baseUrl: {{ .Values.config.sdnc.url }} + topologyId: {{ .Values.config.sdnc.topologyId }} auth: username: ${SDNC_USERNAME} password: ${SDNC_PASSWORD} diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/logback.xml b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/logback.xml deleted file mode 100644 index 2a62c86e77..0000000000 --- a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/logback.xml +++ /dev/null @@ -1,36 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2021 Nordix Foundation - ================================================================================ - 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. - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> - -<configuration scan="true" scanPeriod="30 seconds" debug="false"> - - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%d - %highlight(%-5level) [%-20.20thread] %cyan(%logger{36}) - %msg%n</pattern> - </encoder> - </appender> - <appender name="AsyncSysOut" class="ch.qos.logback.classic.AsyncAppender"> - <appender-ref ref="STDOUT" /> - </appender> - - <root level="INFO"> - <appender-ref ref="AsyncSysOut" /> - </root> - -</configuration> - |