From 46016ff61eede4a1b08f1feaa9ff4b1607da3ea9 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Fri, 3 Aug 2018 11:38:47 -0400 Subject: [PATCH] Configuration fixes for integration heat env Change-Id: Iba90d7fdd8bc6fb86c2c0c777432aab5a8e18431 Issue-ID: SO-710 Signed-off-by: Rob Daugherty --- .../api-handler-infra/onapheat/override.yaml | 48 +++++++++++----------- .../config/asdc-controller/onapheat/override.yaml | 31 ++++++++++++-- .../so/config/bpmn-infra/onapheat/override.yaml | 38 ++++++++--------- .../catalog-db-adapter/onapheat/override.yaml | 9 +++- .../openstack-adapter/onapheat/override.yaml | 41 +++++++++++------- .../request-db-adapter/onapheat/override.yaml | 9 +++- .../so/config/sdnc-adapter/onapheat/override.yaml | 18 ++++---- .../so/config/vfc-adapter/onapheat/override.yaml | 14 ++----- 8 files changed, 124 insertions(+), 84 deletions(-) diff --git a/volumes/so/config/api-handler-infra/onapheat/override.yaml b/volumes/so/config/api-handler-infra/onapheat/override.yaml index 03ae5e0..f812789 100644 --- a/volumes/so/config/api-handler-infra/onapheat/override.yaml +++ b/volumes/so/config/api-handler-infra/onapheat/override.yaml @@ -13,7 +13,7 @@ mso: endpoint: "http://c1.vm1.mso.simpledemo.openecomp.org:8082" db: auth: Basic cGFzc3dvcmQxJA== - config: + config: path: /src/main/resources/ infra: default: @@ -29,7 +29,7 @@ mso: homing: sdna: url: http://c1.vm1.mso.simpledemo.openecomp.org:8086/ - password: 4112B789E942B161228F7D5AFC654C0F + password: 4112B789E942B161228F7D5AFC654C0F bpelURL: http://c1.vm1.mso.simpledemo.openecomp.org:8082/ bpelAuth: 786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1 camundaURL: http://c1.vm1.mso.simpledemo.openecomp.org:8082/ @@ -65,15 +65,14 @@ mso: spring: datasource: url: jdbc:mariadb://mariadb:3306/catalogdb - username: ${MYSQL_ROOT_USERNAME} - password: ${MYSQL_ROOT_PASSWORD} + username: cataloguser + password: catalog123 driver-class-name: org.mariadb.jdbc.Driver - dbcp2: + dbcp2: initial-size: 5 - max-total: 20 + max-total: 20 validation-query: select 1 - test-on-borrow: true - + test-on-borrow: true jpa: show-sql: true hibernate: @@ -83,36 +82,39 @@ spring: enable-lazy-load-no-trans: true jersey: type: filter + security: usercredentials: - - + - username: sitecontrol password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' - role: SiteControl-Client - - + role: SiteControl-Client + - username: gui password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' - role: GUI-Client - - + role: GUI-Client + - username: infraportal password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' - role: InfraPortal-Client - - + role: InfraPortal-Client + - username: bpel password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' - role: BPEL-Client - - + role: BPEL-Client + - username: mso_admin password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' - role: ACTUATOR + role: ACTUATOR + request: datasource: url: jdbc:mariadb://mariadb:3306/requestdb - username: ${MYSQL_ROOT_USERNAME} - password: ${MYSQL_ROOT_PASSWORD} - driver-class-name: org.mariadb.jdbc.Driver - dbcp2: + username: requestuser + password: request123 + driver-class-name: org.mariadb.jdbc.Driver + dbcp2: initial-size: 5 - max-total: 20 + max-total: 20 validation-query: select 1 test-on-borrow: true + diff --git a/volumes/so/config/asdc-controller/onapheat/override.yaml b/volumes/so/config/asdc-controller/onapheat/override.yaml index 888ac1d..6afc196 100644 --- a/volumes/so/config/asdc-controller/onapheat/override.yaml +++ b/volumes/so/config/asdc-controller/onapheat/override.yaml @@ -2,17 +2,40 @@ server: port: 8085 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: asdc password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: Asdc-Client - - + - username: mso_admin password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: ACTUATOR +request: + datasource: + url: jdbc:mariadb://mariadb:3306/requestdb + username: requestuser + password: request123 + driver-class-name: org.mariadb.jdbc.Driver + dbcp2: + initial-size: 5 + max-total: 20 + validation-query: select 1 + test-on-borrow: true + mso: logPath: ./logs/asdc catalog: @@ -22,7 +45,7 @@ mso: db: auth: Basic YnBlbDpwYXNzd29yZDEk site-name: onapheat - aai: + aai: endpoint: https://aai.api.simpledemo.onap.org:8443 asdc-connections: asdc-controller1: @@ -36,7 +59,7 @@ mso: pollingTimeout: 60 relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL activateServerTLSAuth: false - keyStorePassword: + keyStorePassword: keyStorePath: watchDogTimeout: 60 isFitlerInEmptyResources: true diff --git a/volumes/so/config/bpmn-infra/onapheat/override.yaml b/volumes/so/config/bpmn-infra/onapheat/override.yaml index 208ab09..52f558a 100644 --- a/volumes/so/config/bpmn-infra/onapheat/override.yaml +++ b/volumes/so/config/bpmn-infra/onapheat/override.yaml @@ -29,7 +29,7 @@ mso: db: auth: 26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764 password: wLg4sjrAFUS8rfVfdvTXeQ== - endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083/services/RequestsDbAdapter + endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083/services/RequestsDbAdapter spring: endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083 network: @@ -71,7 +71,7 @@ mso: auth: Basic YnBlbDptc28tZGItMTUwNyE= default: adapter: - namespace: http://org.openecomp.mso + namespace: http://org.openecomp.mso healthcheck: log: debug: 'false' @@ -80,12 +80,12 @@ mso: id: testCustIdInfra msoKey: 07a7159d3bf51a0e53be7a8f89699be7 po: - timeout: PT60S + timeout: PT60S request: db: endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083/ rollback: 'true' - sdnc: + sdnc: password: 3141634BF7E070AA289CF2892C986C0B service: agnostic: @@ -97,12 +97,12 @@ mso: auth: test:testpwd callback: http://c1.vm1.mso.simpledemo.openecomp.org:8086/adapters/rest/SDNCNotify endpoint: http://replaceme:28090/optimizationInstance/V1/create - timeout: PT30M + timeout: PT30M workflow: CreateGenericVNFV1: aai: volume-group: - uri: /aai/v6/cloud-infrastructure/volume-groups/volume-group + uri: /aai/v6/cloud-infrastructure/volume-groups/volume-group default: aai: version: '8' @@ -166,7 +166,7 @@ mso: global: default: aai: - namespace: http://org.openecomp.aai.inventory/ + namespace: http://org.openecomp.aai.inventory/ message: endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8081/mso/WorkflowMessage notification: @@ -199,17 +199,17 @@ sdnc: auth: Basic YWRtaW46YWRtaW4= host: https://localhost:8443 path: /restconf/operations/GENERIC-RESOURCE-API - + appc: client: topic: - read: + read: name: APPC-LCM-WRITE - timeout: 360000 + timeout: 360000 write: APPC-LCM-READ sdnc: read: - name: SDNC-LCM-WRITE + name: SDNC-LCM-WRITE write: SDNC-LCM-READ response: timeout: 360000 @@ -221,15 +221,15 @@ server: port: 8081 tomcat: max-threads: 50 -spring: +spring: datasource: - driver-class-name: org.mariadb.jdbc.Driver + driver-class-name: org.mariadb.jdbc.Driver url: jdbc:mariadb://mariadb:3306/camundabpmn username: camundauser password: camunda123 - dbcp2: + dbcp2: initial-size: 5 - max-total: 20 + max-total: 20 validation-query: select 1 test-on-borrow: true security: @@ -241,20 +241,20 @@ spring: - username: sdncaBpmn password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' - role: BPMN-Client + role: BPMN-Client - username: poBpmn password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: BPMN-Client - - + - username: wmaBpmn password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: BPMN-Client - - + - username: sniro password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: SNIRO-Client - - + - username: mso_admin password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: ACTUATOR diff --git a/volumes/so/config/catalog-db-adapter/onapheat/override.yaml b/volumes/so/config/catalog-db-adapter/onapheat/override.yaml index 0c51ffa..11f65db 100644 --- a/volumes/so/config/catalog-db-adapter/onapheat/override.yaml +++ b/volumes/so/config/catalog-db-adapter/onapheat/override.yaml @@ -20,6 +20,11 @@ spring: driver-class-name: org.mariadb.jdbc.Driver initialize: false initialization-mode: never + dbcp2: + initial-size: 5 + max-total: 20 + validation-query: select 1 + test-on-borrow: true jpa: generate-ddl: false show-sql: false @@ -34,13 +39,13 @@ spring: username: bpel password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: BPEL-Client - - + - username: mso_admin password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: ACTUATOR #Actuator -management: +management: context-path: /manage flyway: diff --git a/volumes/so/config/openstack-adapter/onapheat/override.yaml b/volumes/so/config/openstack-adapter/onapheat/override.yaml index 6704415..b1d7279 100644 --- 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" diff --git a/volumes/so/config/request-db-adapter/onapheat/override.yaml b/volumes/so/config/request-db-adapter/onapheat/override.yaml index d20700f..3531a32 100644 --- a/volumes/so/config/request-db-adapter/onapheat/override.yaml +++ b/volumes/so/config/request-db-adapter/onapheat/override.yaml @@ -16,6 +16,11 @@ spring: driver-class-name: org.mariadb.jdbc.Driver initialize: false initialization-mode: never + dbcp2: + initial-size: 5 + max-total: 20 + validation-query: select 1 + test-on-borrow: true jpa: generate-ddl: false show-sql: false @@ -30,13 +35,13 @@ spring: username: bpel password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: BPEL-Client - - + - username: mso_admin password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: ACTUATOR #Actuator -management: +management: context-path: /manage flyway: diff --git a/volumes/so/config/sdnc-adapter/onapheat/override.yaml b/volumes/so/config/sdnc-adapter/onapheat/override.yaml index 2ac2062..19da1a9 100644 --- a/volumes/so/config/sdnc-adapter/onapheat/override.yaml +++ b/volumes/so/config/sdnc-adapter/onapheat/override.yaml @@ -115,40 +115,40 @@ org: sdncurl6: 'http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/VNF-API:' sdncurl8: 'http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/NBNC-API:' sdncurl9: http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/NORTHBOUND-API:service-topology-operation - service: + service: infra: service-topology-infra-activate-operation: POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1 service-topology-infra-assign-operation: POST|120000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1 service-topology-infra-delete-operation: POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1 - service-topology-infra-release-operation: POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1 + service-topology-infra-release-operation: POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1 vfmodule: '': query: GET|60000|sdncurl12| -spring: +spring: security: usercredentials: - - + - username: sdnc password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: SDNC-Client - - + - username: sitecontrol password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: SiteControl-Client - - + - username: bpel password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' role: BPEL-Client - - + - username: sniro password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' 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 diff --git a/volumes/so/config/vfc-adapter/onapheat/override.yaml b/volumes/so/config/vfc-adapter/onapheat/override.yaml index 4471373..af2a5ce 100644 --- a/volumes/so/config/vfc-adapter/onapheat/override.yaml +++ b/volumes/so/config/vfc-adapter/onapheat/override.yaml @@ -1,15 +1,15 @@ logging: path: logs -spring: +spring: datasource: - driver-class-name: org.mariadb.jdbc.Driver + driver-class-name: org.mariadb.jdbc.Driver url: jdbc:mariadb://mariadb:3306/requestdb username: requestuser password: request123 - dbcp2: + dbcp2: initial-size: 5 - max-total: 20 + max-total: 20 validation-query: select 1 test-on-borrow: true @@ -26,9 +26,3 @@ management: enabled: false basic: enabled: false - metrics: - se-global-registry: false - export: - prometheus: - enabled: true # Whether exporting of metrics to Prometheus is enabled. - step: 1m # Step size (i.e. reporting frequency) to use. -- 2.16.6