From 02f077ed38336c7ba98175449719139d17a3290e Mon Sep 17 00:00:00 2001
From: "sunil.unnava" <sunil.unnava@att.com>
Date: Thu, 28 Mar 2019 20:50:29 -0400
Subject: DMAAP changes

add Mirror Maker
MR AAF integration
Fix BC images and minor BC bugs
Kafka upgrade to 1.1.1

Issue-ID: DMAAP-823
Change-Id: Ia7a1321a6fbfa9bfc65f90bca40ef236c2dbadef
Signed-off-by: sunil.unnava <sunil.unnava@att.com>
---
 .../components/dmaap-bc/resources/config/dmaapbc.properties    | 10 +++++-----
 .../dmaap/components/dmaap-bc/templates/post-install-job.yaml  |  5 +++++
 kubernetes/dmaap/components/dmaap-bc/values.yaml               |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'kubernetes/dmaap/components/dmaap-bc')

diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
index faa19c6f4d..f15b9a12d1 100644
--- a/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
@@ -25,7 +25,7 @@
 #
 #####################################################
 # Indicator for whether to use AAF
-UseAAF: false
+UseAAF: true
 
 # csit: stubs out some southbound APIs for csit
 csit: No
@@ -198,10 +198,9 @@ KeyStoreType: jks
 KeyStoreFile: etc/keystore
 
 # password for the https keystore
-KeyStorePassword:  *j&Z*Ma;.4My4M]W0eB*fal$
-
+KeyStorePassword:  Y@Y5f&gm?PAz,CVQL,lk[VAF
 # password for the private key in the https keystore
-KeyPassword: *j&Z*Ma;.4My4M]W0eB*fal$
+KeyPassword: Y@Y5f&gm?PAz,CVQL,lk[VAF
 
 # type of truststore for https
 TrustStoreType: jks
@@ -210,8 +209,9 @@ TrustStoreType: jks
 TrustStoreFile: etc/org.onap.dmaap-bc.trust.jks
 
 # password for the https truststore
-TrustStorePassword: pi8HuuSbN03MtQQ7(5TcyQ6;
+TrustStorePassword: 8b&R5%l$l:@jSWz@FCs;rhY*
 
 # path to the file used to trigger an orderly shutdown
 QuiesceFile: etc/SHUTDOWN
 
+inHttpsPort: 0
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
index 02ad199e45..ee24cfb548 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
@@ -26,9 +26,14 @@ spec:
       containers:
       - name: post-install-job
         image: "{{ include "common.repository" . }}/{{ .Values.global.clientImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: DELAY
           value: "0"
+        - name: PROTO
+          value: "http"
+        - name: PORT
+          value: "8080"
         - name: REQUESTID
           value: "{{.Chart.Name}}-post-install"
         volumeMounts:
diff --git a/kubernetes/dmaap/components/dmaap-bc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
index 2d791df6c6..a7fc3d88db 100644
--- a/kubernetes/dmaap/components/dmaap-bc/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/values.yaml
@@ -30,7 +30,7 @@ pullPolicy: Always
 
 # application images
 repository: nexus3.onap.org:10001
-image: onap/dmaap/dmaap-bc:1.1.1
+image: onap/dmaap/dmaap-bc:1.1.2
 
 
 # application configuration
-- 
cgit 1.2.3-korg