commit 5b074b87335a98ba08b41f1e89d36f25fd25d798
author Yang Xu <yang.xu3@huawei.com> Wed Oct 31 17:28:03 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Wed Oct 31 17:28:03 2018 +0000
tree e326b48291c070e55e22c27a5ffeefc6549b780d
parent c1e1483d0860ead2bcafefe49a060fbad37e67aa
parent d76b325b3c15e2c8897c979d82759b858d2cc33c

Merge "APPC OpenStack params for integration-override"

deployment/heat/onap-oom/env/tlab/onap-oom.env

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index 3b97c5a..a53527c 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -46,6 +46,14 @@
       replicaCount: 1
       config:
         enableClustering: false
+        enableAAF: false
+        openStackType: "OpenStackProvider"
+        openStackName: "OpenStack"
+        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0"
+        openStackServiceTenantName: "${OS_PROJECT_NAME}"
+        openStackDomain: "${OS_USER_DOMAIN_NAME}"
+        openStackUserName: "${OS_USERNAME}"
+        openStackEncryptedPassword: "${OS_PASSWORD}"
     sdnc:
       replicaCount: 1
       config:

deployment/heat/onap-oom/env/windriver/onap-oom.env

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index cb42966..b4e77ec 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -47,6 +47,14 @@
       replicaCount: 1
       config:
         enableClustering: false
+        enableAAF: false
+        openStackType: "OpenStackProvider"
+        openStackName: "OpenStack"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
+        openStackServiceTenantName: "${OS_PROJECT_NAME}"
+        openStackDomain: "${OS_USER_DOMAIN_NAME}"
+        openStackUserName: "${OS_USERNAME}"
+        openStackEncryptedPassword: "${OS_PASSWORD}"
     sdnc:
       replicaCount: 1
       config: