From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Wed, 8 May 2019 11:06:40 +0000 (+0000)
Subject: Merge "Tighten authenticated topic provisioning"
X-Git-Tag: 4.0.0-ONAP~147
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e2a4520e6c14ca2220631408a1f9c1410a4dee15;hp=620e596ccc19676665fad1b32d7d284dba330278;p=oom.git

Merge "Tighten authenticated topic provisioning"
---

diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
index dc9298de65..bcfefe93cf 100644
--- a/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
@@ -101,6 +101,9 @@ MR.TopicMgrRole: org.onap.dmaap-bc-topic-mgr.client
 # MR topic ProjectID (used in certain topic name generation formats)
 MR.projectID:  mr
 
+# Use Basic Authentication when provisioning topics
+MR.authentication: basicAuth
+
 
 #####################################################
 #
diff --git a/kubernetes/dmaap/components/message-router/resources/mr_clusters/san-francisco.json b/kubernetes/dmaap/components/message-router/resources/mr_clusters/san-francisco.json
index 9e732d2af8..6c201f6b30 100644
--- a/kubernetes/dmaap/components/message-router/resources/mr_clusters/san-francisco.json
+++ b/kubernetes/dmaap/components/message-router/resources/mr_clusters/san-francisco.json
@@ -1,6 +1,6 @@
 {
   "dcaeLocationName": "san-francisco",
   "fqdn": "message-router",
-  "topicProtocol": "http",
-  "topicPort": "3904"
+  "topicProtocol": "https",
+  "topicPort": "3905"
 }