From 9d013afce190ff5b94473da93b4a58fe83729604 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Thu, 7 Mar 2019 12:19:54 -0500 Subject: [PATCH] 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 --- deployment/heat/onap-oom/env/tlab/onap-oom.env | 2 +- deployment/heat/onap-oom/env/windriver/onap-oom-light.env | 9 +++++---- deployment/heat/onap-oom/env/windriver/onap-oom.env | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env index bf015b739..43b6ed15a 100644 --- 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 a991cede0..c3f6159ea 100644 --- 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 792f2ca6a..5a0cfbeaa 100644 --- 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" -- 2.16.6