Merge "Fix Volumeclaim clash between MUSIC and AAI"

diff --git a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
index 0c125b1..4e1866c 100644 (file)
--- a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
@@ -31,6 +31,21 @@ spec:
         app: {{ include "common.name" . }}
         release: {{ .Release.Name }}
     spec:
+      initContainers:
+        - command:
+          - /root/ready.py
+          args:
+          - --container-name
+          - aai-cassandra
+          env:
+          - name: NAMESPACE
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.namespace
+          image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          name: {{ include "common.name" . }}-readiness
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"

diff --git a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12 b/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12
index dbf4fca..7a4979a 100644 (file)
Binary files a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12 and b/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12 differ

diff --git a/kubernetes/aai/charts/aai-gizmo/templates/service.yaml b/kubernetes/aai/charts/aai-gizmo/templates/service.yaml
index ac34ed9..a584800 100644 (file)
--- a/kubernetes/aai/charts/aai-gizmo/templates/service.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/templates/service.yaml
@@ -29,8 +29,9 @@ spec:
   ports:
   {{ if .Values.global.installSidecarSecurity }}
       {{if eq .Values.service.type "NodePort" -}}
-      - port: {{ .Values.global.rproxy.port }}
+      - port: {{ .Values.service.internalPort }}
         nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+        targetPort: {{ .Values.global.rproxy.port }}
         name: {{ .Values.service.portName }}
       {{- else -}}
       - port: {{ .Values.service.externalPort }}

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 3fe511f..79d545b 100755 (executable)
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -45,7 +45,7 @@ function usage
        echo "       demo.sh <namespace> deleteVNF <module_name from instantiateVFW>"
     echo "               - Delete the module created by instantiateVFW"
        echo " "
-       echo "       demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service>"
+       echo "       demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
     echo "               - Run heatbridge against the stack for the given service instance and service"
 }
 
@@ -149,8 +149,8 @@ do
        heatbridge)
                        TAG="heatbridge"
                        shift
-                       if [ $# -ne 3 ];then
-                               echo "Usage: demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service>"
+                       if [ $# -ne 4 ];then
+                               echo "Usage: demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
                                exit
                        fi
                        VARIABLES="$VARIABLES -v HB_STACK:$1"
@@ -159,6 +159,8 @@ do
                        shift
                        VARIABLES="$VARIABLES -v HB_SERVICE:$1"
                        shift
+                       VARIABLES="$VARIABLES -v HB_IPV4_OAM_ADDRESS:$1"
+                       shift
                        ;;
        cds)
                        TAG="cds"