Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / cps / components / ncmp-dmi-plugin / resources / config / application-helm.yml

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 d388823..2b68b6c 100644 (file)
--- 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,26 +18,26 @@
 # ============LICENSE_END=========================================================
 */}}
 
-server:
-  port: 8080
+dmi:
+  service:
+    url: {{ .Values.config.dmiServiceUrl }}
 
 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}
 
 security:
   # comma-separated uri patterns which do not require authorization
-  permit-uri: /manage/**,/swagger-ui/**,/swagger-resources/**,/v3/api-docs
+  permit-uri: /actuator/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**,/v3/api-docs
   auth:
     username: ${DMI_PLUGIN_USERNAME}
     password: ${DMI_PLUGIN_PASSWORD}
@@ -49,6 +49,18 @@ logging:
       onap:
         cps: {{ .Values.logging.cps }}
 
+{{- with (first .Values.kafkaUser.acls) }}
+spring.kafka.consumer.group-id: {{ .name }}
+{{- end }}
+spring.kafka.bootstrap-servers: {{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
+spring.kafka.security.protocol: SASL_PLAINTEXT
+spring.kafka.properties.sasl.mechanism: {{ .Values.kafkaUser.authenticationType | upper }}
+spring.kafka.properties.sasl.jaas.config: ${SASL_JAAS_CONFIG}
+
+# Kafka Topics
+{{- if .Values.topics.config }}
+{{ toYaml .Values.topics.config | nindent 2 }}
+{{- end }}
 
 {{- if .Values.config.additional }}
 {{ toYaml .Values.config.additional | nindent 2 }}