Update integration-override settings for SO

Change-Id: Ifb168388d12ae71aa3714e947a7ddab23322917d
Issue-ID: INT-586
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 aae5f12..a77da73 100644 (file)
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -35,10 +35,11 @@ parameters:
       config:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
-      config:
-        openStackUserName: "${OS_USERNAME}"
-        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
-        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+      so-openstack-adapter:
+        config:
+          openStackUserName: "${OS_USERNAME}"
+          openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0"
+          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
       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 ff5e2a3..8f7322f 100644 (file)
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -35,10 +35,11 @@ parameters:
       config:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
-      config:
-        openStackUserName: "${OS_USERNAME}"
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+      so-openstack-adapter:
+        config:
+          openStackUserName: "${OS_USERNAME}"
+          openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
+          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
       replicaCount: 1
       config: