diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2018-11-08 13:01:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-08 13:01:23 +0000 |
| commit | 28b7a260a87bf87acd42ad8d526b4471ab8c1023 (patch) | |
| tree | a16b68388777a0c990ee775aa20763b18ddb284a | |
| parent | f2b75221b163145101d54839d06a503ae10ba101 (diff) | |
| parent | cb6fd18c83f000a20a88c9641010d74befd89b30 (diff) | |
Merge "Allow nodeport values to be changed"
3 files changed, 8 insertions, 3 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml index 09d0db005c..f330e647b4 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml @@ -19,8 +19,8 @@ {{ if .Values.componentImages.datafile_collector }} tag_version: {{ include "common.repository" . }}/{{ .Values.componentImages.datafile_collector }} {{ end }} -host_port: 30223 -host_port_secure: 30262 +host_port: {{ .Values.config.address.datafile_collector.port }} +host_port_secure: {{ .Values.config.address.datafile_collector.portSecure }} dmaap_mr_host: "{{ .Values.config.address.message_router }}" dmaap_mr_port: 3904 dmaap_mr_user: "admin" diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml index 07231fe89a..078af0cb75 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml @@ -19,7 +19,7 @@ {{ if .Values.componentImages.ves }} tag_version: {{ include "common.repository" . }}/{{ .Values.componentImages.ves }} {{ end }} -external_port : "30235" +external_port : {{ .Values.config.address.ves.port }} ves_other_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.SEC_OTHER_OUTPUT/" ves_heartbeat_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT/" ves_fault_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.SEC_FAULT_OUTPUT/" diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml index e6264fa631..d8ed347c40 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml @@ -35,12 +35,17 @@ config: host: consul-server port: 8500 cm: dcae-cloudify-manager + datafile_collector: + port: 30223 + portSecure: 30262 dmaap_dr_prov: dmaap-dr-prov message_router: message-router msb_discovery: msb-discovery msb_iag: msb-iag policy_pdp: pdp sdc: sdc-be + ves: + port: 30235 # redisCaching is a string not a boolean! redisCaching: "false" |