diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2022-12-07 10:56:27 +0000 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2022-12-07 15:59:59 +0000 |
| commit | bda6aeaa60607ab4fe5af508156019d7bd5c0ce4 (patch) | |
| tree | 24bae3847c1139ba9aed95ce286277202aae9a93 /datarouter-node/src/main/resources | |
| parent | b37d32a39c7096e39fc389f15d150e8c2b8c54c2 (diff) | |
[DMAAP-DR] Remove AAF/TLS phase 1
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Ifeae01dd8e7f0a737d8b74594a8061ae3d4ea647
Issue-ID: DMAAP-1642
Diffstat (limited to 'datarouter-node/src/main/resources')
| -rw-r--r-- | datarouter-node/src/main/resources/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | datarouter-node/src/main/resources/node.properties | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/datarouter-node/src/main/resources/docker/Dockerfile b/datarouter-node/src/main/resources/docker/Dockerfile index 7bc92c83..38ea3b9e 100644 --- a/datarouter-node/src/main/resources/docker/Dockerfile +++ b/datarouter-node/src/main/resources/docker/Dockerfile @@ -19,7 +19,7 @@ # limitations under the License. # ============LICENSE_END==================================================== # -FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0 +FROM nexus3.onap.org:10001/onap/integration-java11:10.0.0 COPY /opt /opt diff --git a/datarouter-node/src/main/resources/node.properties b/datarouter-node/src/main/resources/node.properties index f7c24fab..ac9aec22 100644 --- a/datarouter-node/src/main/resources/node.properties +++ b/datarouter-node/src/main/resources/node.properties @@ -24,16 +24,16 @@ # Configuration parameters set at startup for the DataRouter node # # URL to retrieve dynamic configuration -ProvisioningURL = https://dmaap-dr-prov:8443/internal/prov +ProvisioningURL = http://dmaap-dr-prov/internal/prov # # URL to upload PUB/DEL/EXP logs -LogUploadURL = https://dmaap-dr-prov:8443/internal/logs +LogUploadURL = http://dmaap-dr-prov/internal/logs # # The port number for http as seen within the server IntHttpPort = 8080 # # The port number for https as seen within the server -IntHttpsPort = 8443 +IntHttpsPort = 8080 # # The external port number for https taking port mapping into account ExtHttpsPort = 443 @@ -71,6 +71,9 @@ NodeAuthKey = Node123! # DR_NODE DEFAULT ENABLED TLS PROTOCOLS NodeHttpsProtocols = TLSv1.1|TLSv1.2 # +# AAF CADI enabled flag +CadiEnabled = false +# # AAF type to generate permission string AAFType = org.onap.dmaap-dr.feed # @@ -80,11 +83,8 @@ AAFInstance = legacy # AAF action to generate permission string - default should be publish AAFAction = publish # -# AAF CADI enabled flag -CadiEnabled = false -# # AAF Props file path AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props # https security required for publish request -TlsEnabled = true +TlsEnabled = false |