Merge "Fix Defaults"

diff --git a/volumes/so/config/bpmn-infra/onapheat/override.yaml b/volumes/so/config/bpmn-infra/onapheat/override.yaml
index 9f34ba6..be315eb 100644 (file)
--- a/volumes/so/config/bpmn-infra/onapheat/override.yaml
+++ b/volumes/so/config/bpmn-infra/onapheat/override.yaml
@@ -110,9 +110,9 @@ mso:
       aai:
         version: '14'
         cloud-region:
-          version: '9'
+          version: '14'
         generic-vnf:
-          version: '9'
+          version: '14'
         v14:
           customer:
             uri: /aai/v14/business/customers/customer

diff --git a/volumes/so/config/openstack-adapter/onapheat/override.yaml b/volumes/so/config/openstack-adapter/onapheat/override.yaml
index e56b168..7292177 100644 (file)
--- a/volumes/so/config/openstack-adapter/onapheat/override.yaml
+++ b/volumes/so/config/openstack-adapter/onapheat/override.yaml
@@ -93,7 +93,7 @@ mso:
       spring:
         endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
   db:
-    auth: Basic YnBlbDptc28tZGItMTUwNyE=
+    auth: Basic YnBlbDpwYXNzd29yZDEk
   site-name: localDevEnv
   async:
     core-pool-size: 50