From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 8 Nov 2018 18:53:58 +0000 (+0000)
Subject: Merge "Update Docker manifest for POMBA"
X-Git-Tag: 3.0.0~75
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8b764b35919133a5c92640dedc588539bda1124d;hp=6d9341d3f0e9b7f989a1808480f130bd76f584f8;p=integration.git

Merge "Update Docker manifest for POMBA"
---

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index a871e3f10..e5b6d6258 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -49,7 +49,7 @@ parameters:
       replicaCount: 1
       config:
         enableClustering: false
-        enableAAF: true
+        enableAAF: false
         openStackType: "OpenStackProvider"
         openStackName: "OpenStack"
         openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0"
@@ -57,6 +57,8 @@ parameters:
         openStackDomain: "${OS_USER_DOMAIN_NAME}"
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
+        odlUser: admin
+        odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     sdnc:
       replicaCount: 1
       config:
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index dccfed8ce..2ddda328c 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -50,7 +50,7 @@ parameters:
       replicaCount: 1
       config:
         enableClustering: false
-        enableAAF: true
+        enableAAF: false
         openStackType: "OpenStackProvider"
         openStackName: "OpenStack"
         openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
@@ -58,6 +58,8 @@ parameters:
         openStackDomain: "${OS_USER_DOMAIN_NAME}"
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
+        odlUser: admin
+        odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     sdnc:
       replicaCount: 1
       config: