From: James MacNider <James.MacNider@amdocs.com>
Date: Wed, 6 Mar 2019 14:12:52 +0000 (+0000)
Subject: Merge "AaiCtxBuilder:Use direct GET instead of search qry"
X-Git-Tag: 4.0.0-ONAP~338
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0b559d0d9def026ab5f097e768b40bffbed88031;hp=e9c8f13357dc8f9ea521ce6553d107576f70b439;p=oom.git

Merge "AaiCtxBuilder:Use direct GET instead of search qry"
---

diff --git a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
index ea9051e55c..592c390084 100755
--- a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -64,6 +64,7 @@ org:
           retrycount: 5
           retryinterval: -15
           retrylist: 408,429,500,502,503,504,900
+          encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
         tenant:
           default_keystone_url_version: /v2.0
           default_keystone_reg_ex: "/[vV][0-9]"
diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml
index 3b75e0c426..dc8a8fcec8 100755
--- a/kubernetes/so/resources/config/overrides/override.yaml
+++ b/kubernetes/so/resources/config/overrides/override.yaml
@@ -97,3 +97,10 @@ request:
       max-total: 20
       validation-query: select 1
       test-on-borrow: true
+org:
+  onap:
+    so:
+      cloud-owner: onap
+      adapters:
+        network:
+          encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7