diff options
author | Yang Xu <yang.xu3@huawei.com> | 2018-10-31 23:39:30 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-10-31 23:39:30 +0000 |
commit | 7e3bccc945d7a7fc9d63336ccb4e5c628e99d6d1 (patch) | |
tree | b96868e0fea77d1590eece052b7be1131d9abab9 | |
parent | ef50c0cd6001bfb60301f0e04de91816eb683a9f (diff) | |
parent | 84fd3a5d99594dbea3696ceb59d7fad97b9ef7d7 (diff) |
Merge "Enable AAF credentials for APPC"
-rw-r--r-- | deployment/heat/onap-oom/env/tlab/onap-oom.env | 5 | ||||
-rw-r--r-- | deployment/heat/onap-oom/env/windriver/onap-oom.env | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env index a53527cba..a871e3f10 100644 --- a/deployment/heat/onap-oom/env/tlab/onap-oom.env +++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env @@ -19,6 +19,9 @@ parameters: repository: __docker_proxy__ pullPolicy: IfNotPresent robot: + flavor: large + 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}" @@ -46,7 +49,7 @@ parameters: replicaCount: 1 config: enableClustering: false - enableAAF: false + enableAAF: true openStackType: "OpenStackProvider" openStackName: "OpenStack" openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0" diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env index b4e77ecaf..dccfed8ce 100644 --- a/deployment/heat/onap-oom/env/windriver/onap-oom.env +++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env @@ -19,6 +19,9 @@ parameters: repository: __docker_proxy__ pullPolicy: IfNotPresent robot: + flavor: large + appcUsername: "appc@appc.onap.org" + appcPassword: "demo123456!" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "__public_net_id__" openStackTenantId: "${OS_PROJECT_ID}" @@ -47,7 +50,7 @@ parameters: replicaCount: 1 config: enableClustering: false - enableAAF: false + enableAAF: true openStackType: "OpenStackProvider" openStackName: "OpenStack" openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0" |