Merge "[CONSUL] Add limits to consul chart."

[oom.git] / kubernetes / dmaap / components / dmaap-dr-node / resources / config / node.properties

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties b/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties
index 2046dbf..1d0015e 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties
+++ b/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties
@@ -1,3 +1,4 @@
+{{/*
 #-------------------------------------------------------------------------------
 # ============LICENSE_START==================================================
 # * org.onap.dmaap
@@ -26,23 +27,24 @@
 #    URL to retrieve dynamic configuration
 #
 #ProvisioningURL:    ${DRTR_PROV_INTURL}
-ProvisioningURL=https://{{.Values.config.dmaapDrProv.name}}:{{.Values.config.dmaapDrProv.externalPort2}}/internal/prov
+*/}}
+ProvisioningURL=https://{{ .Values.global.dmaapDrProvName }}:{{ .Values.global.dmaapDrProvExtPort2 }}/internal/prov
 
 #
 #    URL to upload PUB/DEL/EXP logs
 #
 #LogUploadURL:    ${DRTR_LOG_URL}
-LogUploadURL=https://{{.Values.config.dmaapDrProv.name}}:{{.Values.config.dmaapDrProv.externalPort2}}/internal/logs
+LogUploadURL=https://{{ .Values.global.dmaapDrProvName }}:{{ .Values.global.dmaapDrProvExtPort2 }}/internal/logs
 
 #
 #    The port number for http as seen within the server
 #
 #IntHttpPort:    ${DRTR_NODE_INTHTTPPORT:-8080}
-IntHttpPort={{.Values.config.dmaapDrNode.internalPort}}
+IntHttpPort={{ include "common.getPort" (dict "global" . "name" "api" "getPlain" true) }}
 #
 #    The port number for https as seen within the server
 #
-IntHttpsPort={{.Values.config.dmaapDrNode.internalPort2}}
+IntHttpsPort={{ include "common.getPort" (dict "global" . "name" "api") }}
 #
 #    The external port number for https taking port mapping into account
 #
@@ -59,7 +61,7 @@ MinRedirSaveInterval=10000
 #
 #    The path to the directory where log files are stored
 #
-LogDir=/opt/app/datartr/logs
+LogDir={{ .Values.persistence.event.path }}
 #
 #    The retention interval (in days) for log files
 #
@@ -67,45 +69,38 @@ LogRetention=30
 #
 #    The path to the directories where data and meta data files are stored
 #
-SpoolDir=/opt/app/datartr/spool
+SpoolDir={{ .Values.persistence.spool.path }}
 #
 #    The path to the redirection data file
 #
-#RedirectionFile:    etc/redirections.dat
+RedirectionFile = etc/redirections.dat
 #
 #    The type of keystore for https
-#
-KeyStoreType=jks
-#
-#    The path to the keystore for https
-#
-KeyStoreFile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
-#
-#    The password for the https keystore
-#
-KeyStorePassword=]3V)($O&.Mv]W{f8^]6SxGNL
-#
-#    The password for the private key in the https keystore
-#
-KeyPassword=]3V)($O&.Mv]W{f8^]6SxGNL
+KeyStoreType = PKCS12
 #
 #    The type of truststore for https
+TrustStoreType = jks
 #
-TrustStoreType=jks
-#
-#    The path to the truststore for https
+#    The path to the file used to trigger an orderly shutdown
+QuiesceFile = etc/SHUTDOWN
 #
-TrustStoreFile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
+#    The key used to generate passwords for node to node transfers
+NodeAuthKey = Node123!
 #
-#    The password for the https truststore
+#    DR_NODE DEFAULT ENABLED TLS PROTOCOLS
+NodeHttpsProtocols = TLSv1.1|TLSv1.2
 #
-TrustStorePassword=(Rd,&{]%ePdp}4JZjqoJ2G+g
+#    AAF type to generate permission string
+AAFType = org.onap.dmaap-dr.feed
 #
-#    The path to the file used to trigger an orderly shutdown
+#    AAF default instance to generate permission string - default should be legacy
+AAFInstance = legacy
 #
-QuiesceFile=etc/SHUTDOWN
+#    AAF action to generate permission string - default should be publish
+AAFAction = publish
 #
-#    The key used to generate passwords for node to node transfers
+#    AAF CADI enabled flag
+CadiEnabled = false
 #
-NodeAuthKey=Node123!
-
+#    AAF Props file path
+AAFPropsFilePath = {{ .Values.aafConfig.credsPath }}/org.onap.dmaap-dr.props