summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/charts/so-sdnc-adapter
diff options
context:
space:
mode:
authorRamesh Parthasarathy <rp6768@att.com>2018-09-14 21:22:43 +0000
committerRamesh Parthasarathy <rp6768@att.com>2018-09-14 21:26:35 +0000
commit1ceefda34e9720cdb25739665fd39d74dd22d64c (patch)
tree25a37e0e766cb9a2621898a508722bdaa3a5ecf4 /kubernetes/so/charts/so-sdnc-adapter
parent95f819a35f8ca316647b4a8341a589985f3c21d8 (diff)
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)<rp6768@att.com>
Diffstat (limited to 'kubernetes/so/charts/so-sdnc-adapter')
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml24
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/templates/configmap.yaml6
2 files changed, 13 insertions, 17 deletions
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 }}