Modifications for AAF identities
Change-Id: I8eb1e09fb6256ef08d858b3fb94c887dab6244b7
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-856
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/dmaapbc.properties b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/dmaapbc.properties
index f2a6dd9..faa19c6 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/dmaapbc.properties
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/dmaapbc.properties
@@ -31,7 +31,7 @@
csit: No
# name of this DMaaP instance (deprecated)
-DmaapName: demo
+#DmaapName: demo
#####################################################
#
@@ -39,7 +39,7 @@
#
#####################################################
# FQDN of DR Prov Server (deprecated)
-DR.provhost: dcae-drps.domain.not.set
+#DR.provhost: dcae-drps.domain.not.set
# URI to retrieve dynamic DR configuration
ProvisioningURI: /internal/prov
@@ -99,7 +99,7 @@
MR.TopicMgrRole: org.onap.dmaap-bc-topic-mgr.client
# MR topic ProjectID (used in certain topic name generation formats)
-MR.projectID: ONAP
+MR.projectID: mr
#####################################################
@@ -130,6 +130,9 @@
# Admin Password
aaf.AdminPassword: {{ .Values.adminPwd }}
+# Identity that is owner of any created namespaces for topics
+aaf.NsOwnerIdentity: {{ .Values.adminUser }}
+
# location of the codec keyfile used to decrypt passwords in this properties file before they are passed to AAF
CredentialCodeKeyfile: etc/LocalKey
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
index 9cf147f..4d009e9 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
@@ -31,6 +31,10 @@
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
spec:
+ hostAliases:
+ - ip: "10.12.6.214"
+ hostnames:
+ - "aaf-onap-test.osaaf.org"
initContainers:
- command:
- /root/ready.py
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
index 0483ce5..6d7b7c3 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
@@ -31,12 +31,12 @@
# application images
repository: nexus3.onap.org:10001
-image: onap/dmaap/buscontroller:1.0.23
+image: onap/dmaap/buscontroller:1.0.25
# application configuration
dmaapMessageRouterService: message-router
-aafURL: https://aaf-authz/
+aafURL: https://aaf-onap-test.osaaf.org:8095/proxy/
topicMgrUser: dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org
topicMgrPwd: demo123456!
adminUser: aaf_admin@people.osaaf.org