Configuration fixes for integration heat env

[so/docker-config.git] / volumes / so / config / openstack-adapter / onapheat / override.yaml

diff --git a/volumes/so/config/openstack-adapter/onapheat/override.yaml b/volumes/so/config/openstack-adapter/onapheat/override.yaml
index 6704415..b1d7279 100644 (file)
--- a/volumes/so/config/openstack-adapter/onapheat/override.yaml
+++ b/volumes/so/config/openstack-adapter/onapheat/override.yaml
@@ -1,30 +1,41 @@
 server:
   port: 8087
- 
+
 spring:
+  datasource:
+    url: jdbc:mariadb://mariadb:3306/catalogdb
+    username: cataloguser
+    password: catalog123
+    driver-class-name: org.mariadb.jdbc.Driver
+    dbcp2:
+      initial-size: 5
+      max-total: 20
+      validation-query: select 1
+      test-on-borrow: true
+
   security:
     usercredentials:
-    -  
+    -
       username: sdnc
       password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
       role: SDNC-Client
-    -  
+    -
       username: sitecontrol
       password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: SiteControl-Client 
-    -  
+      role: SiteControl-Client
+    -
       username: bpel
       password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: BPEL-Client        
-    -  
+      role: BPEL-Client
+    -
       username: sniro
       password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: SNIRO-Client  
-    -  
+      role: SNIRO-Client
+    -
       username: apih
       password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
       role: MSO-Client
-    -  
+    -
       username: mso_admin
       password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
       role: ACTUATOR
@@ -54,7 +65,7 @@ org:
           retrycount: 5
           retryinterval: -15
           retrylist: 408,429,500,502,503,504,900
-        tenant: 
+        tenant:
           default_keystone_url_version: /v2.0
           default_keystone_reg_ex: "/[vV][0-9]"
           default_tenant_description: Tenant
@@ -64,7 +75,7 @@ org:
           default_no_regions_status_string: no regions
           default_quota_value: 10
           set_default_quota: false
- 
+
 ecomp:
   mso:
     adapters:
@@ -74,7 +85,7 @@ ecomp:
         retryCount: 3
         pollTimeout: 7500
         pollInterval: 15
-      
+
 mso:
   logPath: ./logs/openstack
   catalog:
@@ -99,7 +110,7 @@ cloud_config:
       member_role: "admin"
       tenant_metadata: true
       identity_server_type: "KEYSTONE"
-      identity_authentication_type: "RACKSPACE_APIKEY"   
+      identity_authentication_type: "RACKSPACE_APIKEY"
   cloud_sites:
     Dallas:
       region_id: "DFW"
@@ -115,7 +126,7 @@ cloud_config:
       region_id: "ORD"
       clli: "ORD"
       aic_version: "2.5"
-      identity_service_id: "RAX_KEYSTONE" 
+      identity_service_id: "RAX_KEYSTONE"
     DEFAULT:
       region_id: "DFW"
       clli: "DFW"