Override so-catalog-db params

- Replace so-openstack-adapter with so-catalog-db

Change-Id: I2a7e32eb14b11b71e0ab6d9588603fa08d97c40e
Issue-ID: INT-950
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index bf015b7..43b6ed1 100644 (file)
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -47,7 +47,7 @@ parameters:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
       enabled: true
-      so-openstack-adapter:
+      so-catalog-db-adapter:
         config:
           openStackUserName: "${OS_USERNAME}"
           openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0"

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
index a991ced..c3f6159 100644 (file)
--- a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
@@ -38,10 +38,11 @@ parameters:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
       enabled: true
-      config:
-        openStackUserName: "${OS_USERNAME}"
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+      so-catalog-db-adapter:
+        config:
+          openStackUserName: "${OS_USERNAME}"
+          openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
+          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
       enabled: true
       replicaCount: 1

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 792f2ca..5a0cfbe 100644 (file)
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -48,7 +48,7 @@ parameters:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
       enabled: true
-      so-openstack-adapter:
+      so-catalog-db-adapter:
         config:
           openStackUserName: "${OS_USERNAME}"
           openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"