diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-17 21:20:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-17 21:20:35 +0000 |
| commit | ffb5d8f810679b24211060cb895b79d1851c3de0 (patch) | |
| tree | a07186bbf523ed0e3073562d1c8689c0043c4422 /kubernetes/so/charts/so-vfc-adapter | |
| parent | 2dd257050d497887ea73cc17378e9250e70b8508 (diff) | |
| parent | 1ceefda34e9720cdb25739665fd39d74dd22d64c (diff) | |
Merge "SO override files to use apt kube dns address"
Diffstat (limited to 'kubernetes/so/charts/so-vfc-adapter')
| -rwxr-xr-x | kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml | 15 | ||||
| -rwxr-xr-x | kubernetes/so/charts/so-vfc-adapter/templates/configmap.yaml | 6 |
2 files changed, 3 insertions, 18 deletions
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 }} |