aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-11-14 09:00:01 -0800
committerGary Wu <gary.i.wu@huawei.com>2018-11-14 09:05:50 -0800
commitb212dce9131be6539015e1c1c7ad090cf613d173 (patch)
tree8fa7cb51f1d1c70a39ad464ae2380ed12598a330
parent50fe3bb96fd34355aea2ec50199e328f59d16596 (diff)
Enable AAF for APPC
Change-Id: Ibebf7d82c4b07b1484efe79f4e4e05c68f45c261 Issue-ID: APPC-1237 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--deployment/heat/onap-oom/env/tlab/onap-oom.env7
-rw-r--r--deployment/heat/onap-oom/env/windriver/onap-oom.env7
2 files changed, 4 insertions, 10 deletions
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: