From 1ceefda34e9720cdb25739665fd39d74dd22d64c Mon Sep 17 00:00:00 2001 From: Ramesh Parthasarathy Date: Fri, 14 Sep 2018 21:22:43 +0000 Subject: SO override files to use apt kube dns address All SO override files are updated with correct kube dns address for inter application communications based on review comments Change-Id: I6e1487f3d5a7db49df3e40fb41b6b148aacfee8d Issue-ID: SO-1022 Signed-off-by: Ramesh Parthasarathy(rp6768) --- .../resources/config/overrides/override.yaml | 69 ++++++++++------------ 1 file changed, 30 insertions(+), 39 deletions(-) (limited to 'kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml') diff --git a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml index 01f836ae80..9021ef5003 100755 --- a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml @@ -15,7 +15,7 @@ aai: auth: 2630606608347B7124C244AB0FE34F6F dme2: timeout: '30000' - endpoint: https://aai.api.simpledemo.onap.org:8443 + endpoint: https://aai.{{ include "common.namespace" . }}:8443 camunda: bpm: admin-user: @@ -39,50 +39,50 @@ mso: adapters: requestDb: auth: Basic YnBlbDptc28tZGItMTUwNyE= - endpoint: https://c1.vm1.mso.simpledemo.onap.org:8081 + endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083 completemsoprocess: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/CompleteMsoProcess + endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/CompleteMsoProcess db: auth: 26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764 password: wLg4sjrAFUS8rfVfdvTXeQ== - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter + endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/services/RequestsDbAdapter spring: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083 + endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083 network: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/NetworkAdapter + endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/NetworkAdapter rest: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/networks + endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/networks openecomp: db: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/services/RequestsDbAdapter + endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/services/RequestsDbAdapter po: auth: 757A94191D685FD2092AC1490730A4FC password: 3141634BF7E070AA289CF2892C986C0B sdnc: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/SDNCAdapter + endpoint: http://mso-sdnc-adapter.{{ include "common.namespace" . }}:8086/adapters/SDNCAdapter rest: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/v1/sdnc + endpoint: http://mso-sdnc-adapter.{{ include "common.namespace" . }}:8086/adapters/rest/v1/sdnc timeout: PT60S tenant: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/TenantAdapter + endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/TenantAdapter vnf: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapter + endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAdapter rest: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/vnfs/v1/vnfs + endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/vnfs/v1/vnfs volume-groups: rest: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/volume-groups + endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}g:8087/services/rest/v1/volume-groups vnf-async: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapterAsync + endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAsyncAdapter bpmn: process: historyTimeToLive: '30' callbackRetryAttempts: '5' catalog: db: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082/ecomp/mso/catalog + endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8083/ecomp/mso/catalog spring: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082 + endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8083 db: auth: Basic YnBlbDptc28tZGItMTUwNyE= default: @@ -98,7 +98,7 @@ mso: timeout: PT60S request: db: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083/ + endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/ rollback: 'true' sdnc: password: 3141634BF7E070AA289CF2892C986C0B @@ -110,7 +110,7 @@ mso: site-name: CamundaEngine sniro: auth: test:testpwd - callback: http://c1.vm1.mso.simpledemo.onap.org:8086/adapters/rest/SDNCNotify + callback: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/adapters/rest/SDNCNotify endpoint: http://replaceme:28090/optimizationInstance/V1/create timeout: PT30M workflow: @@ -183,20 +183,20 @@ mso: aai: namespace: http://org.onap.aai.inventory/ message: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage + endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage notification: name: GenericNotificationServiceATT sdncadapter: - callback: http://c1.vm1.mso.simpledemo.onap.org:8086/mso/SDNCAdapterCallbackService + callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/SDNCAdapterCallbackService vnfadapter: create: - callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify + callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback delete: - callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify + callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback query: - callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify + callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback rollback: - callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify + callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback global: dmaap: username: testuser @@ -208,11 +208,11 @@ policy: auth: Basic dGVzdHBkcDphbHBoYTEyMw== client: auth: Basic bTAzNzQzOnBvbGljeVIwY2sk - endpoint: https://localhost:8081/pdp/api/ + endpoint: http://pdp.{{ include "common.namespace" . }}:8081/pdp/api/ environment: TEST sdnc: auth: Basic YWRtaW46YWRtaW4= - host: https://localhost:8443 + host: https://sdc-be.{{ include "common.namespace" . }}:8443 path: /restconf/operations/GENERIC-RESOURCE-API appc: client: @@ -230,22 +230,12 @@ appc: key: VIlbtVl6YLhNUrtU secret: 64AG2hF4pYeG2pq7CT6XwUOT service: ueb - poolMembers: ueb1.simpledemo.onap.org:3904,ueb2.simpledemo.onap.org:3904 + poolMembers: message-router.{{ include "common.namespace" . }}:3904,message-router.{{ include "common.namespace" . }}:3904 server: port: 8081 tomcat: max-threads: 50 spring: - datasource: - driver-class-name: org.mariadb.jdbc.Driver - url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - dbcp2: - initial-size: 5 - max-total: 20 - validation-query: select 1 - test-on-borrow: true security: usercredentials: - @@ -271,4 +261,5 @@ spring: - username: mso_admin password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' - role: ACTUATOR \ No newline at end of file + role: ACTUATOR + -- cgit 1.2.3-korg