From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 8 Nov 2018 01:28:17 +0000 (-0800)
Subject: Disable AAF for APPC
X-Git-Tag: 3.0.0~76
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7bbf5be80a8f1bd5e8b17e3738557042199e0ecf;p=integration.git

Disable AAF for APPC

Change-Id: Iaf3cd8acd451eb15703b6ac0c9637e282f936e2a
Issue-ID: APPC-1237
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

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: