From a31a059029e7d802cdaecfe02ca0ce593516a1f4 Mon Sep 17 00:00:00 2001
From: vrvarma <vikas.varma@att.com>
Date: Mon, 18 May 2020 19:37:19 -0400
Subject: [PATCH] Update oof so callback credentials

Update oof so callback credentials

Change-Id: I210c1fe8f89a486a740449b641f8ff94fd1d3a8e
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-756
(cherry picked from commit 26dbd2bb64f6489259fc46174d39cd67b3397cc4)
---
 kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json | 4 ++--
 kubernetes/aaf/charts/aaf-sms/templates/job.yaml         | 7 +++++++
 kubernetes/aaf/charts/aaf-sms/values.yaml                | 8 ++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json b/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json
index 7666ff3077..add0808701 100644
--- a/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json
+++ b/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json
@@ -5,8 +5,8 @@
             {
                 "name": "so",
                 "values": {
-                    "UserName": "",
-                    "Password": ""
+                    "UserName": "${SO_USER}",
+                    "Password": "${SO_PASS}"
                 }
             },
             {
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/job.yaml b/kubernetes/aaf/charts/aaf-sms/templates/job.yaml
index 7a17b917ae..bb145ef3f8 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/job.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/templates/job.yaml
@@ -51,6 +51,7 @@ spec:
            export CONFIG_DB_PASS=${CONFIG_DB_PASS_PLAIN};
            export OSDF_PCI_OPT_PASS=${OSDF_PCI_OPT_PASS_PLAIN};
            export OSDF_OPT_ENGINE_PASS=${OSDF_OPT_ENGINE_PASS_PLAIN};
+           export SO_PASS=${SO_PASS_PLAIN};
            cd /config-input;
            for PFILE in `find . -not -type d | grep -v -F ..`; do
              envsubst <${PFILE} >/config/${PFILE};
@@ -125,6 +126,12 @@ spec:
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "osdf-opt-engine-creds" "key" "login") | indent 10 }}
         - name: OSDF_OPT_ENGINE_PASS_PLAIN
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "osdf-opt-engine-creds" "key" "password") | indent 10 }}
+
+        - name: SO_USER
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "so-creds" "key" "login") | indent 10 }}
+        - name: SO_PASS_PLAIN
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "so-creds" "key" "password") | indent 10 }}
+
         volumeMounts:
         - mountPath: /config-input
           name: {{ include "common.name" . }}-preload-input
diff --git a/kubernetes/aaf/charts/aaf-sms/values.yaml b/kubernetes/aaf/charts/aaf-sms/values.yaml
index 12312c5430..13e9a7e701 100644
--- a/kubernetes/aaf/charts/aaf-sms/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/values.yaml
@@ -156,6 +156,11 @@ secrets:
     login: '{{ .Values.oofCreds.osdfOptEngineUsername }}'
     password: '{{ .Values.oofCreds.osdfOptEnginePassword }}'
     passwordPolicy: required
+  - uid: so-creds
+    type: basicAuth
+    login: '{{ .Values.oofCreds.soUsername }}'
+    password: '{{ .Values.oofCreds.soPassword }}'
+    passwordPolicy: required
 
 oofCreds:
   aaiUsername: oof@oof.onap.org
@@ -200,6 +205,9 @@ oofCreds:
   osdfOptEngineUsername: opt_test
   osdfOptEnginePassword: opt_testpwd
 
+  soUsername: apihBpmn
+  soPassword: password1$
+
 # Configure resource requests and limits
 resources:
   small:
-- 
2.16.6