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: 4.0.0-ONAP~15^2~51^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a8a554cd591c0cf4cdaa532562f242fea70a379e;p=aai%2Foom.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/charts/aai-traversal/templates/job.yaml b/charts/aai-traversal/templates/job.yaml
index c8efed7..e2fe395 100644
--- a/charts/aai-traversal/templates/job.yaml
+++ b/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/values.yaml b/values.yaml
index e216b35..d5a5db0 100644
--- a/values.yaml
+++ b/values.yaml
@@ -31,6 +31,7 @@ global: # global defaults
   restartPolicy: Always
 
   installSidecarSecurity: false
+  aafEnabled: true
 
   fproxy:
     name: forward-proxy