Merge "correct the license header"

diff --git a/INFO.yaml b/INFO.yaml
index d639336..da3cd81 100644 (file)
--- 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/common/music/charts/music-tomcat/templates/deployment.yaml b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
index 1fec55c..2e04b15 100755 (executable)
--- 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 3ef1434..8a76cdd 100644 (file)
--- 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 9c9a6ff..0ec43f5 100755 (executable)
--- 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