summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-09-17 21:20:35 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-17 21:20:35 +0000
commitffb5d8f810679b24211060cb895b79d1851c3de0 (patch)
treea07186bbf523ed0e3073562d1c8689c0043c4422
parent2dd257050d497887ea73cc17378e9250e70b8508 (diff)
parent1ceefda34e9720cdb25739665fd39d74dd22d64c (diff)
Merge "SO override files to use apt kube dns address"
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml69
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml6
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/values.yaml2
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml27
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml6
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml14
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml6
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml27
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/templates/configmap.yaml6
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml35
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/templates/configmap.yaml6
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml24
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml6
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml15
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml6
-rwxr-xr-xkubernetes/so/resources/config/overrides/override.yaml54
-rwxr-xr-xkubernetes/so/templates/configmap.yaml6
-rwxr-xr-xkubernetes/so/values.yaml4
18 files changed, 81 insertions, 238 deletions
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
+
diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml
index 48d9ef8820..a03dbd8930 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/configmap.yaml
@@ -26,8 +26,4 @@ metadata:
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }} \ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-bpmn-infra/values.yaml b/kubernetes/so/charts/so-bpmn-infra/values.yaml
index b5fbef048d..e513e6a90d 100755
--- a/kubernetes/so/charts/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/values.yaml
@@ -29,7 +29,7 @@ updateStrategy:
maxUnavailable: 1
maxSurge: 1
# Resource Limit flavor -By Default using small
-flavor: small
+flavor: large
# Segregation for Different environment (Small and Large)
resources:
small:
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
index 65f22b73b8..bdf82b6fbd 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
@@ -22,30 +22,10 @@ mso:
catalog:
db:
spring:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
auth: Basic YnBlbDpwYXNzd29yZDEk
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- 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
- hibernate:
- ddl-auto: validate
- naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
- enable-lazy-load-no-trans: true
- database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
security:
usercredentials:
-
@@ -59,8 +39,3 @@ spring:
#Actuator
management:
context-path: /manage
-flyway:
- base-on-migrate: true
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- user: ${DB_USERNAME}
- password: ${DB_PASSWORD} \ No newline at end of file
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml
index 48d9ef8820..a03dbd8930 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/configmap.yaml
@@ -26,8 +26,4 @@ metadata:
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }} \ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
index f964364225..331ee65b36 100755
--- a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -14,16 +14,6 @@
server:
port: 8087
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
security:
usercredentials:
-
@@ -98,7 +88,7 @@ mso:
catalog:
db:
spring:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
auth: Basic YnBlbDptc28tZGItMTUwNyE=
site-name: localDevEnv
@@ -137,4 +127,4 @@ cloud_config:
region_id: "DFW"
clli: "DFW"
aic_version: "2.5"
- identity_service_id: "RAX_KEYSTONE" \ No newline at end of file
+ identity_service_id: "RAX_KEYSTONE"
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml
index 48d9ef8820..a03dbd8930 100755
--- a/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/templates/configmap.yaml
@@ -26,8 +26,4 @@ metadata:
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }} \ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml
index 82117b03d5..f995d94b3a 100755
--- a/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml
@@ -23,28 +23,8 @@ 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
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- 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
- hibernate:
- ddl-auto: validate
- naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
- enable-lazy-load-no-trans: true
- database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
security:
usercredentials:
-
@@ -58,8 +38,3 @@ spring:
#Actuator
management:
context-path: /manage
-flyway:
- base-on-migrate: true
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD} \ No newline at end of file
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/configmap.yaml
index 48d9ef8820..a03dbd8930 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/configmap.yaml
@@ -26,8 +26,4 @@ metadata:
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }} \ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml
index f33737ddc2..899274c715 100755
--- a/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml
@@ -16,16 +16,6 @@ aai:
server:
port: 8085
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
security:
usercredentials:
-
@@ -36,36 +26,25 @@ spring:
username: mso_admin
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
role: ACTUATOR
-request:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
mso:
msoKey: 07a7159d3bf51a0e53be7a8f89699be7
logPath: ./logs/sdc
catalog:
db:
spring:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
auth: Basic YnBlbDpwYXNzd29yZDEk
site-name: onapheat
aai:
- endpoint: https://aai.api.simpledemo.onap.org:8443
+ endpoint: https://aai.{{ include "common.namespace" . }}:8443
asdc-connections:
asdc-controller1:
user: mso
consumerGroup: sdc-OpenSource-Env1
consumerId: sdc-COpenSource-Env11
environmentName: AUTO
- asdcAddress: c2.vm1.sdc.simpledemo.onap.org:8443
+ asdcAddress: sdc-be.{{ include "common.namespace" . }}:8443
password: 613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247
pollingInterval: 60
pollingTimeout: 60
@@ -75,7 +54,7 @@ mso:
keyStorePath:
watchDogTimeout: 60
isFitlerInEmptyResources: true
- messageBusAddress: vm1.mr.simpledemo.onap.org,vm1.mr.simpledemo.onap.org
+ messageBusAddress: message-router.{{ include "common.namespace" . }},message-router.{{ include "common.namespace" . }}
asdc:
config:
key: 566B754875657232314F5548556D3665
@@ -83,4 +62,8 @@ mso:
count: 3,
componentNames: SO,AAI,SDNC
scheduling:
- enabled: false \ No newline at end of file
+ enabled: false
+ adapters:
+ requestDb:
+ auth: Basic YnBlbDptc28tZGItMTUwNyE=
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/configmap.yaml b/kubernetes/so/charts/so-sdc-controller/templates/configmap.yaml
index 48d9ef8820..a03dbd8930 100755
--- a/kubernetes/so/charts/so-sdc-controller/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/templates/configmap.yaml
@@ -26,8 +26,4 @@ metadata:
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }} \ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml
index 4479206ed3..26916f92ed 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml
@@ -22,7 +22,7 @@ mso:
catalog:
db:
spring:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
auth: Basic cGFzc3dvcmQxJA==
site-name: onapheat
@@ -84,7 +84,7 @@ org:
delete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
rollback: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
bpelauth: cGFzc3dvcmQxJA==
- bpelurl: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/SDNCAdapterCallbackService
+ bpelurl: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/SDNCAdapterCallbackService
generic-resource:
network-topology-operation:
activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
@@ -115,18 +115,18 @@ org:
mobility:
'':
query: GET|60000|sdncurl5|
- myurl: http://c1.vm1.mso.simpledemo.onap.org:8081/adapters/rest/SDNCNotify
+ myurl: http://so-sdnc-adapter{{ include "common.namespace" . }}:8086/adapters/rest/SDNCNotify
rest:
- bpelurl: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage
+ bpelurl: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
sdncauth: 406B2AE613211B6FB52466DE6E1769AC
sdncconnecttime: 5000
- sdncurl10: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/GENERIC-RESOURCE-API:'
- sdncurl11: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/VNFTOPOLOGYAIC-API:'
- sdncurl12: http://c1.vm1.sdnc.simpledemo.onap.org:8282/
- sdncurl5: http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/config
- sdncurl6: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/VNF-API:'
- sdncurl8: 'http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/NBNC-API:'
- sdncurl9: http://c1.vm1.sdnc.simpledemo.onap.org:8282/restconf/operations/NORTHBOUND-API:service-topology-operation
+ sdncurl10: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/operations/GENERIC-RESOURCE-API:'
+ sdncurl11: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/operations/VNFTOPOLOGYAIC-API:'
+ sdncurl12: http://sdnc.{{ include "common.namespace" . }}:8282/
+ sdncurl5: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/config
+ sdncurl6: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/operations/VNF-API:'
+ sdncurl8: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/operations/NBNC-API:'
+ sdncurl9: http://sdnc.{{ include "common.namespace" . }}:8282/restconf/operations/NORTHBOUND-API:service-topology-operation
service:
infra:
service-topology-infra-activate-operation: POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
@@ -162,4 +162,4 @@ spring:
-
username: mso_admin
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
- role: ACTUATOR \ No newline at end of file
+ role: ACTUATOR
diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml
index 48d9ef8820..a03dbd8930 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml
@@ -26,8 +26,4 @@ metadata:
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }} \ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
index 6c26671296..6f579e7c1d 100755
--- a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml
@@ -13,17 +13,6 @@
# limitations under the License.
logging:
path: logs
-spring:
- datasource:
- driver-class-name: org.mariadb.jdbc.Driver
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
server:
port: 8084
tomcat:
@@ -34,10 +23,10 @@ mso:
adapters:
requestDb:
auth: Basic YnBlbDptc28tZGItMTUwNyE=
- endpoint: https://c1.vm1.mso.simpledemo.onap.org:8081
+ endpoint: https://so-request-db-adapter.{{ include "common.namespace" . }}:8083
#Actuator
management:
security:
enabled: false
basic:
- enabled: false \ No newline at end of file
+ enabled: false
diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml
index 48d9ef8820..a03dbd8930 100755
--- a/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml
@@ -26,8 +26,4 @@ metadata:
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }} \ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml
index 99c76cdbbd..9d3c167c21 100755
--- a/kubernetes/so/resources/config/overrides/override.yaml
+++ b/kubernetes/so/resources/config/overrides/override.yaml
@@ -7,18 +7,18 @@ mso:
msoKey: "07a7159d3bf51a0e53be7a8f89699be7"
logPath: logs
site-name: onapheat
- adapters:
- requestDb:
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083
- auth: YnBlbDptc28tZGItMTUwNyE=
catalog:
db:
spring:
- endpoint: "http://c1.vm1.mso.simpledemo.onap.org:8082"
+ endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
auth: Basic cGFzc3dvcmQxJA==
- config:
- path: /src/main/resources/
+ adapters:
+ requestDb:
+ auth: YnBlbDptc28tZGItMTUwNyE=
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
+ config:
+ path: /src/main/resources/
infra:
default:
alacarte:
@@ -32,11 +32,11 @@ mso:
apih:
homing:
sdna:
- url: http://c1.vm1.mso.simpledemo.onap.org:8086/
+ url: http://so-sdnc-adapter.{{ include "common.namespace" . }}:8086/
password: 4112B789E942B161228F7D5AFC654C0F
- bpelURL: http://c1.vm1.mso.simpledemo.onap.org:8082/
+ bpelURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8082/
bpelAuth: 786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1
- camundaURL: http://c1.vm1.mso.simpledemo.onap.org:8082/
+ camundaURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8082/
camundaAuth: 5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1
async:
core-pool-size: 50
@@ -48,40 +48,23 @@ mso:
activate:
instanceid: test
userid: cs0008
- endpoint: http://c1.vm1.mso.simpledemo.onap.org:28090
+ endpoint: http://sdc-be.{{ include "common.namespace" . }}:8443
tenant:
isolation:
retry:
count: 3
aai:
- endpoint: https://aai.api.simpledemo.onap.org:8443
+ endpoint: https://aai.{{ include "common.namespace" . }}:8443
auth: 2630606608347B7124C244AB0FE34F6F
so:
operational-environment:
dmaap:
username: testuser
password: VjR5NDcxSzA=
- host: http://c1.vm1.mso.simpledemo.onap.org:28090
+ host: http://dmaap-bc.{{ include "common.namespace" . }}:8080
publisher:
topic: com.att.ecomp.mso.operationalEnvironmentEvent
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
- jpa:
- show-sql: true
- hibernate:
- dialect: org.hibernate.dialect.MySQL5Dialect
- ddl-auto: validate
- naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
- enable-lazy-load-no-trans: true
jersey:
type: filter
security:
@@ -110,14 +93,3 @@ spring:
username: mso_admin
password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
role: ACTUATOR
-request:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true \ No newline at end of file
diff --git a/kubernetes/so/templates/configmap.yaml b/kubernetes/so/templates/configmap.yaml
index 48d9ef8820..a03dbd8930 100755
--- a/kubernetes/so/templates/configmap.yaml
+++ b/kubernetes/so/templates/configmap.yaml
@@ -26,8 +26,4 @@ metadata:
name: {{ include "common.fullname" . }}-app-configmap
namespace: {{ include "common.namespace" . }}
data:
- {{- $yamlpath := printf "resources/config/overrides/override.yaml" -}}
- {{- $root := . }}
- {{- range $path, $bytes := .Files.Glob $yamlpath }}
- override.yaml: {{ $root.Files.Get $path | quote }}
- {{- end }} \ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index e5af3895c6..b01d48623a 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -47,8 +47,8 @@ resources:
cpu: 1000m
memory: 2Gi
livenessProbe:
- path: /manage/health
- scheme: HTTPS
+ path: /manage/health
+ scheme: HTTP
initialDelaySeconds: 600
periodSeconds: 60
timeoutSeconds: 10