From: Alexis de Talhouët Date: Wed, 7 Nov 2018 15:39:57 +0000 (+0000) Subject: Merge "Fix bad port variables in helm drools chart." X-Git-Tag: 3.0.0-ONAP~65 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=34e852aa63e5c4a3e8e1daebc664e072c09f06ef;hp=135f4119a4cdd2f24dd6212227755cade6a59e23;p=oom.git Merge "Fix bad port variables in helm drools chart." --- diff --git a/INFO.yaml b/INFO.yaml index d6393366e9..da3cd81e8b 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -63,11 +63,11 @@ committers: company: 'ATT' id: 'jh245g' timezone: 'America/New York' - - name: 'Mike Elliott' - email: 'mike.elliott@amdocs.com' - company: 'Amdocs' - id: 'melliott' - timezone: 'Canada/Ontario' + - name: 'David Sauvageau' + email: 'david.sauvageau@bell.ca' + company: 'Bell' + id: 'david.sauvageau' + timezone: 'Canada/Montreal' - name: 'Mandeep Khinda' email: 'Mandeep.Khinda@amdocs.com' company: 'Amdocs' diff --git a/kubernetes/appc/resources/config/log/org.ops4j.pax.logging.cfg b/kubernetes/appc/resources/config/log/org.ops4j.pax.logging.cfg index 0bbdbb7dcd..e68057f87a 100644 --- a/kubernetes/appc/resources/config/log/org.ops4j.pax.logging.cfg +++ b/kubernetes/appc/resources/config/log/org.ops4j.pax.logging.cfg @@ -1,19 +1,22 @@ ################################################################################ # -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You 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 +# ============LICENSE_START======================================================= +# ONAP : APPC +# ================================================================================ +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# 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========================================================= # ################################################################################ diff --git a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml index 1fec55caca..2e04b15561 100755 --- a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml +++ b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml @@ -63,7 +63,7 @@ spec: fieldPath: metadata.namespace # War Container - name: "{{ .Chart.Name }}-war" - image: "{{ .Values.repository }}/{{ .Values.warImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.warImage }}" command: ["cp","/app/MUSIC.war","/webapps"] imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: @@ -73,7 +73,7 @@ spec: containers: # Tomcat Container - name: "{{ include "common.name" . }}" - image: "{{ .Values.repository }}/{{ .Values.image }}" + image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/bin/pre_start.sh b/kubernetes/pomba/charts/pomba-contextaggregator/resources/bin/pre_start.sh index 3ef1434f20..8a76cdd929 100644 --- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/bin/pre_start.sh +++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/bin/pre_start.sh @@ -18,7 +18,7 @@ do else # code if not found echo "$i_topic NOT found." - curl -X POST -H "content-type: application/json" --data "Empty post to create topic" http://$dmaap_mr_host:$dmaap_mr_port/events/$i_topic + curl -X POST -H "content-type: application/json" --data '{"event":"create topic"}' http://$dmaap_mr_host:$dmaap_mr_port/events/$i_topic fi done diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties similarity index 100% rename from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties rename to kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml index 9c9a6ff185..0ec43f5ecd 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml +++ b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml @@ -25,7 +25,7 @@ global: # Application configuration defaults. ################################################################# # application image -image: onap/pomba-context-aggregator:1.3.2 +image: onap/pomba-context-aggregator:1.3.3 pullPolicy: Always # flag to enable debugging - application support required