From 98f947ee316f766d91e6f434b91364d69af1d263 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Mon, 30 Apr 2018 12:03:37 -0400 Subject: 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 Signed-off-by: Jack Lucas --- .../resources/inputs/k8s-holmes_rules-inputs.yaml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml (limited to 'kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml') diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml new file mode 100644 index 0000000000..1a808d4eb7 --- /dev/null +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml @@ -0,0 +1,23 @@ +#============LICENSE_START======================================================== +#================================================================================= +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright © 2018 Amdocs, Bell Canada +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +{ + "msb_hostname": "{{ .Values.config.address.msb_discovery }}.{{include "common.namespace" . }}", + "pgaas_cluster_name" : "{{ .Values.postgres.service.name2 }}.{{include "common.namespace" . }}", + "database_name":"holmes" +} -- cgit 1.2.3-korg