From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 14 Nov 2018 17:00:01 +0000 (-0800)
Subject: Enable AAF for APPC
X-Git-Tag: 3.0.0~56
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F80%2F72680%2F1;p=integration.git

Enable AAF for APPC

Change-Id: Ibebf7d82c4b07b1484efe79f4e4e05c68f45c261
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 5ff2e5dfc..04fa44d76 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -22,8 +22,8 @@ parameters:
       pullPolicy: IfNotPresent
     robot:
       flavor: large
-      appcUsername: "admin"
-      appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+      appcUsername: "appc@appc.onap.org"
+      appcPassword: "demo123456!"
       openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
       openStackPublicNetId: "__oam_network_id__" # NOTE: for TLAB, openStackPublicNetId needs to be oam_network_id instead of public_net_id
       openStackTenantId: "${OS_PROJECT_ID}"
@@ -51,7 +51,6 @@ parameters:
       replicaCount: 3
       config:
         enableClustering: true
-        enableAAF: false
         openStackType: "OpenStackProvider"
         openStackName: "OpenStack"
         openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0"
@@ -59,8 +58,6 @@ parameters:
         openStackDomain: "${OS_USER_DOMAIN_NAME}"
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
-        odlUser: admin
-        odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     sdnc:
       replicaCount: 3
       config:
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 300c80ba2..15819ffe1 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -22,8 +22,8 @@ parameters:
       pullPolicy: IfNotPresent
     robot:
       flavor: large
-      appcUsername: "admin"
-      appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+      appcUsername: "appc@appc.onap.org"
+      appcPassword: "demo123456!"
       openStackKeyStoneUrl: "http://10.12.25.2:5000"
       openStackPublicNetId: "__public_net_id__"
       openStackTenantId: "${OS_PROJECT_ID}"
@@ -52,7 +52,6 @@ parameters:
       replicaCount: 3
       config:
         enableClustering: true
-        enableAAF: false
         openStackType: "OpenStackProvider"
         openStackName: "OpenStack"
         openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
@@ -60,8 +59,6 @@ parameters:
         openStackDomain: "${OS_USER_DOMAIN_NAME}"
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
-        odlUser: admin
-        odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     sdnc:
       replicaCount: 3
       config: