Merge "Add readiness dependency on aaf"

4 files changed, 28 insertions, 7 deletions

diff --git a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
index 61c265fe64..ff249ee683 100644
--- a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
@@ -19,3 +19,4 @@ dependencies:
   - name: postgres
     version: ~4.x-0
     repository: '@local'
+    condition: PG.enabled
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
index 294ffa6bc3..f9c4d9e446 100644
--- a/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
@@ -54,8 +54,8 @@ Feed.deleteHandling: SimulateDelete
 # Settings for Soutbound API: Postgresql
 #
 #####################################################
-# flag indieonapdemodbates if we are using postgresql
-UsePGSQL: true
+# flag indicates if we are using postgresql
+UsePGSQL: {{ .Values.PG.enabled  }}
 
 # postgres host name
 # Need to connect to PG primary service, designated by service.name2
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
index 0ecdc1c0e8..fb31454c63 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
+
 # Modifications Copyright © 2018 Amdocs,Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +32,7 @@ spec:
         release: {{ .Release.Name }}
     spec:
       hostAliases:
-      - ip: "10.12.6.214"
+      - ip: "10.12.5.145"
         hostnames:
         - "aaf-onap-test.osaaf.org"
       initContainers:
@@ -40,6 +40,21 @@ spec:
         - /root/ready.py
         args:
         - --container-name
+        - aaf-locate
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: {{ include "common.name" . }}-aaf-readiness
+{{ if .Values.PG.enabled }}
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
         - {{ .Values.postgres.nameOverride }}
         env:
         - name: NAMESPACE
@@ -49,7 +64,8 @@ spec:
               fieldPath: metadata.namespace
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: {{ include "common.name" . }}-readiness
+        name: {{ include "common.name" . }}-postgres-readiness
+{{- end}}
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
diff --git a/kubernetes/dmaap/components/dmaap-bc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
index a7fc3d88db..e59c4d657f 100644
--- a/kubernetes/dmaap/components/dmaap-bc/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/values.yaml
@@ -36,11 +36,11 @@ image: onap/dmaap/dmaap-bc:1.1.2
 # application configuration
 dmaapMessageRouterService: message-router
 # change the following value to point to Windriver instance maintained
-# but AAF team.
+# by AAF team.
 # e.g.
 #aafURL: https://aaf-onap-test.osaaf.org:8095/proxy/
 aafURL: https://aaf-service:8100/
-topicMgrUser: dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org
+topicMgrUser: dmaap-bc@dmaap-bc.onap.org
 topicMgrPwd: demo123456!
 adminUser: aaf_admin@people.osaaf.org
 adminPwd: demo123456!
@@ -50,6 +50,10 @@ adminPwd: demo123456!
 # it will compose the topic namespace using the kubernetes namespace value
 fixedTopicNamespace: true
 
+# for quicker deployments in dev, ability to disable using postgres
+PG:
+  enabled: true
+
 nodeSelector: {}
 
 affinity: {}