From: Kajur, Harish (vk250x) <vk250x@att.com>
Date: Wed, 7 Nov 2018 17:51:35 +0000 (-0500)
Subject: Wait for aaf if enabled
X-Git-Tag: 3.0.0-ONAP~60^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=829a7b393e2ba2806a9164e5dd47716b191a93d3;p=oom.git

Wait for aaf if enabled

Issue-ID: AAI-1759
Change-Id: I8f6ed2586f7d90f053627af42b33e629017f73fd
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
---

diff --git a/kubernetes/aai/charts/aai-traversal/templates/job.yaml b/kubernetes/aai/charts/aai-traversal/templates/job.yaml
index c8efed74ae..e2fe395b95 100644
--- a/kubernetes/aai/charts/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/job.yaml
@@ -39,6 +39,10 @@ spec:
         args:
         - --container-name
         - aai
+        {{ if eq .Values.global.aafEnabled true }}
+        - --container-name
+        - aaf-locate
+        {{ end }}
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index e216b35cf6..d5a5db0494 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -31,6 +31,7 @@ global: # global defaults
   restartPolicy: Always
 
   installSidecarSecurity: false
+  aafEnabled: true
 
   fproxy:
     name: forward-proxy