aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaegen2/charts/dcae-bootstrap/resources
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2018-04-30 12:03:37 -0400
committerLusheng Ji <lji@research.att.com>2018-05-11 01:07:29 +0000
commit98f947ee316f766d91e6f434b91364d69af1d263 (patch)
treeed004844a614eb9a00d7443627a16063ae14f974 /kubernetes/dcaegen2/charts/dcae-bootstrap/resources
parent67a7d1a04eadd5e03f914ddcdbcc0542cf6c3cbc (diff)
Correct input yaml file name for Holmes Rules Eng
additional changes: 1. Delete dcae_ns setting in values files--forces CM to deploy into the common namespace. 2. Conditionally set image name in k8s-inventory-inputs.yaml 3. Comment out componentImage setting--use image version specified in blueprints. 4. Add missing "---" in CM templates/service.yaml 5. Update image versions for bootstrap, healtcheck changes to values.yaml file: 1. update doker versions 2. use onap as namespace for DCAE pods Chages to dcae-healthcheck values.yaml file 1. check health for DACE pods under namespace onap Issue-ID: DCAEGEN2-479 Issue-ID: DCAEGEN2-490 Issue-ID: DCAEGEN2-493 Change-Id: I40d8f0b40b2b6bbf1407493a7d8c03cef856fd9c Signed-off-by: Lusheng Ji <lji@research.att.com> Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'kubernetes/dcaegen2/charts/dcae-bootstrap/resources')
-rw-r--r--kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-input.yaml)0
-rw-r--r--kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml2
2 files changed, 2 insertions, 0 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-input.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml
index 1a808d4eb7..1a808d4eb7 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-input.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml
index 8b5da2efe6..f2127606b5 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml
@@ -24,7 +24,9 @@ sdc_environment_name: "AUTO"
sdc_msg_bus_address: '{{ .Values.config.address.message_router }}.{{include "common.namespace" . }}'
postgres_user_inventory: "postgres"
postgres_password_inventory: "onap123"
+{{ if .Values.componentImages.service_change_handler }}
service_change_handler_image: {{ .Values.componentImages.service_change_handler }}
+{{ end }}
{{ if .Values.componentImages.inventory }}
inventory_image: "{{ .Values.componentImages.inventory }}"
{{ end }}